[backfire] merge r23029, r23030, r23031 and r23032

[openwrt-10.03/.git] / include / package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b3333d3b8a4905e35096de75d0d834ad5550116b..2a274032a72753504758cf130ce07d0657725221 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -12,10 +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:= \
@@ -80,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 -f $(PACKAGE_DIR)/$(1)_*
        rm -rf $$(IDIR_$(1))
        mkdir -p $$(IDIR_$(1))/CONTROL
@@ -124,12 +127,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"                    >> $@; \
-         echo "option offline_root $(TARGET_DIR)"      >> $@ )
-
 endif