[package] base-files: add an experimental "-c" flag which tries to preserve *all...

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

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 34e4091..9212c1f 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -6,12 +6,16 @@
 #
 
 # where to build (and put) .ipk packages
-IPKG:= \
+OPKG:= \
   IPKG_TMP=$(TMP_DIR)/ipkg \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
   IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+  $(STAGING_DIR_HOST)/bin/opkg \
+       -f $(STAGING_DIR)/etc/opkg.conf \
+       --force-depends \
+       --force-overwrite \
+       --force-run-hooks
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
@@ -76,7 +80,7 @@ ifeq ($(DUMP),)
        rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
        touch $$@
 
-    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
+    $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT)
        @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
        mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL
        $(call Package/$(1)/install,$$(IDIR_$(1)))
@@ -108,7 +112,8 @@ ifeq ($(DUMP),)
        @[ -f $$(IPKG_$(1)) ]
 
     $$(INFO_$(1)): $$(IPKG_$(1))
-       $(IPKG) install $$(IPKG_$(1))
+       @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
+       $(OPKG) install $$(IPKG_$(1))
 
     $(1)-clean:
        rm -f $(PACKAGE_DIR)/$(1)_*
@@ -117,9 +122,11 @@ ifeq ($(DUMP),)
 
   endef
 
-  $(STAGING_DIR)/etc/ipkg.conf:
+  $(STAGING_DIR)/etc/opkg.conf:
        mkdir -p $(STAGING_DIR)/etc
-       echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
-       echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
+       ( echo "dest root /"                            > $@; \
+         echo "arch all 100"                           >> $@; \
+         echo "arch $(PKGARCH) 200"                    >> $@; \
+         echo "option offline_root $(TARGET_DIR)"      >> $@ )
 
 endif