summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-09 21:05:51 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-09 21:05:51 +0000
commit5e3ed67a782b5ae7600108ce0568020a807f873a (patch)
tree464e6d1ec6b3b17f546e096e3a50d0fc719e98ef
parent8c59fddb365bcd9a8ab6ce8ecc0c27b8026c0fd4 (diff)
[include] pass opkg offline root as command line arg, solves caching issues when switching between multiple subtargets, thanks Ralph Hempel for reporting
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22990 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 9212c1ff9..0ac6bb53f 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -13,6 +13,7 @@ OPKG:= \
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
@@ -126,7 +127,6 @@ ifeq ($(DUMP),)
mkdir -p $(STAGING_DIR)/etc
( echo "dest root /" > $@; \
echo "arch all 100" >> $@; \
- echo "arch $(PKGARCH) 200" >> $@; \
- echo "option offline_root $(TARGET_DIR)" >> $@ )
+ echo "arch $(PKGARCH) 200" >> $@ )
endif