diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-12 21:16:02 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-12 21:16:02 +0000 |
| commit | f10bd899e621ecf56c0f5d3c55680608eab0c2fa (patch) | |
| tree | 566c25e3ef4f437ffdb4bd6257e605c798b2b584 /include | |
| parent | 67dbab4dd0ccfea6402f8edc434e961c3804e9aa (diff) | |
| download | upstream-f10bd899e621ecf56c0f5d3c55680608eab0c2fa.tar.gz upstream-f10bd899e621ecf56c0f5d3c55680608eab0c2fa.tar.bz2 upstream-f10bd899e621ecf56c0f5d3c55680608eab0c2fa.zip | |
[package] opkg:
- implement --add-dest and --add-arch commandline options, this allows to run entirely without configuration
- tweak default config location patch to not require a config in offline root mode
- rename --force-run-hooks option to --force-postinstall, its a more appropriate name
- utilize new opkg commandline options in package-ipkg.mk and remove config file generation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23032 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/package-ipkg.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 0ac6bb53f6..41f88d84d5 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -12,11 +12,13 @@ OPKG:= \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ $(STAGING_DIR_HOST)/bin/opkg \ - -f $(STAGING_DIR)/etc/opkg.conf \ --offline-root $(TARGET_DIR) \ --force-depends \ --force-overwrite \ - --force-run-hooks + --force-postinstall \ + --add-dest root:/ \ + --add-arch all:100 \ + --add-arch $(ARCH_PACKAGES):200 # invoke ipkg-build with some default options IPKG_BUILD:= \ @@ -81,7 +83,7 @@ ifeq ($(DUMP),) rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) touch $$@ - $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT) + $$(IPKG_$(1)): $(STAMP_BUILT) @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1)) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(call Package/$(1)/install,$$(IDIR_$(1))) @@ -122,11 +124,4 @@ ifeq ($(DUMP),) clean: $(1)-clean endef - - $(STAGING_DIR)/etc/opkg.conf: - mkdir -p $(STAGING_DIR)/etc - ( echo "dest root /" > $@; \ - echo "arch all 100" >> $@; \ - echo "arch $(PKGARCH) 200" >> $@ ) - endif |