[backfire] merge r22990

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22991 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b3333d3b8a4905e35096de75d0d834ad5550116b..000bc719689c0069c53fb454e6513ddffd7a83e2 100644 (file)
--- 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
@@ -129,7 +130,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