summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-06 19:58:05 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-06 19:58:05 +0000
commitb1edd2ac6ecae0ec7c43313c8f66ea96d2a8938c (patch)
tree49527e035ba0d81d9113ffaa677f4e02f0aeba21
parent72d4242263ed73f66c166b2d853a8765d05bdd69 (diff)
downloadopenwrt-b1edd2ac6ecae0ec7c43313c8f66ea96d2a8938c.tar.gz
openwrt-b1edd2ac6ecae0ec7c43313c8f66ea96d2a8938c.tar.bz2
openwrt-b1edd2ac6ecae0ec7c43313c8f66ea96d2a8938c.zip
opkg: add --force-run-hooks option to run postinstall scripts in offline root mode, utilize it for host package install
SVN-Revision: 22960
-rw-r--r--include/package-ipkg.mk3
-rw-r--r--package/opkg/Makefile2
-rw-r--r--package/opkg/patches/014-add-force-run-hooks.patch68
3 files changed, 71 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index ef0720de7a..9212c1ff92 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -14,7 +14,8 @@ OPKG:= \
$(STAGING_DIR_HOST)/bin/opkg \
-f $(STAGING_DIR)/etc/opkg.conf \
--force-depends \
- --force-overwrite
+ --force-overwrite \
+ --force-run-hooks
# invoke ipkg-build with some default options
IPKG_BUILD:= \
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 442f90cd1a..180f84b283 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=opkg
PKG_REV:=528
PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/package/opkg/patches/014-add-force-run-hooks.patch b/package/opkg/patches/014-add-force-run-hooks.patch
new file mode 100644
index 0000000000..cbf9de33b2
--- /dev/null
+++ b/package/opkg/patches/014-add-force-run-hooks.patch
@@ -0,0 +1,68 @@
+--- a/libopkg/opkg_conf.c
++++ b/libopkg/opkg_conf.c
+@@ -54,6 +54,7 @@ opkg_option_t options[] = {
+ { "force_reinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_reinstall },
+ { "force_space", OPKG_OPT_TYPE_BOOL, &_conf.force_space },
+ { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature },
++ { "force_run_hooks", OPKG_OPT_TYPE_BOOL, &_conf.force_run_hooks },
+ { "ftp_proxy", OPKG_OPT_TYPE_STRING, &_conf.ftp_proxy },
+ { "http_proxy", OPKG_OPT_TYPE_STRING, &_conf.http_proxy },
+ { "no_proxy", OPKG_OPT_TYPE_STRING, &_conf.no_proxy },
+--- a/libopkg/opkg_conf.h
++++ b/libopkg/opkg_conf.h
+@@ -73,6 +73,7 @@ struct opkg_conf
+ int force_space;
+ int force_removal_of_dependent_packages;
+ int force_removal_of_essential_packages;
++ int force_run_hooks;
+ int check_signature;
+ int nodeps; /* do not follow dependencies */
+ char *offline_root;
+--- a/libopkg/pkg.c
++++ b/libopkg/pkg.c
+@@ -1249,7 +1249,7 @@ pkg_run_script(pkg_t *pkg, const char *s
+
+ /* XXX: FEATURE: When conf->offline_root is set, we should run the
+ maintainer script within a chroot environment. */
+- if (conf->offline_root) {
++ if (conf->offline_root && !conf->force_run_hooks) {
+ opkg_msg(INFO, "Offline root mode: not running %s.%s.\n",
+ pkg->name, script);
+ return 0;
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -39,6 +39,7 @@ enum {
+ ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES,
+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
+ ARGS_OPT_FORCE_SPACE,
++ ARGS_OPT_FORCE_RUN_HOOKS,
+ ARGS_OPT_NOACTION,
+ ARGS_OPT_DOWNLOAD_ONLY,
+ ARGS_OPT_NODEPS,
+@@ -74,6 +75,8 @@ static struct option long_options[] = {
+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
+ {"force_removal_of_essential_packages", 0, 0,
+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
++ {"force-run-hooks", 0, 0, ARGS_OPT_FORCE_RUN_HOOKS},
++ {"force_run_hooks", 0, 0, ARGS_OPT_FORCE_RUN_HOOKS},
+ {"noaction", 0, 0, ARGS_OPT_NOACTION},
+ {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
+ {"nodeps", 0, 0, ARGS_OPT_NODEPS},
+@@ -153,6 +156,9 @@ args_parse(int argc, char *argv[])
+ case ARGS_OPT_FORCE_SPACE:
+ conf->force_space = 1;
+ break;
++ case ARGS_OPT_FORCE_RUN_HOOKS:
++ conf->force_run_hooks = 1;
++ break;
+ case ARGS_OPT_NODEPS:
+ conf->nodeps = 1;
+ break;
+@@ -242,6 +248,7 @@ usage()
+ printf("\t--force-overwrite Overwrite files from other package(s)\n");
+ printf("\t--force-downgrade Allow opkg to downgrade packages\n");
+ printf("\t--force-space Disable free space checks\n");
++ printf("\t--force-run-hooks Run postinstall scripts even in offline mode\n");
+ printf("\t--noaction No action -- test only\n");
+ printf("\t--download-only No action -- download only\n");
+ printf("\t--nodeps Do not follow dependencies\n");