[kirkwood] Iomega iConnect Wireless platform support

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

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 34e4091..f08cf89 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -6,12 +6,19 @@
 #
 
 # 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 \
+       --offline-root $(TARGET_DIR) \
+       --force-depends \
+       --force-overwrite \
+       --force-postinstall \
+       --add-dest root:/ \
+       --add-arch all:100 \
+       --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
@@ -76,7 +83,7 @@ ifeq ($(DUMP),)
        rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
        touch $$@
 
-    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.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)))
@@ -94,6 +101,7 @@ ifeq ($(DUMP),)
                echo "Provides: $(PROVIDES)"; \
                echo "Source: $(SOURCE)"; \
                echo "Section: $(SECTION)"; \
+               echo "Status: install $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \
                echo "Priority: $(PRIORITY)"; \
                echo "Maintainer: $(MAINTAINER)"; \
                echo "Architecture: $(PKGARCH)"; \
@@ -108,7 +116,9 @@ 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))
+       $(if $(PKGFLAGS),for flag in $(PKGFLAGS); do $(OPKG) flag $$$$flag $(1); done)
 
     $(1)-clean:
        rm -f $(PACKAGE_DIR)/$(1)_*
@@ -116,10 +126,4 @@ ifeq ($(DUMP),)
     clean: $(1)-clean
 
   endef
-
-  $(STAGING_DIR)/etc/ipkg.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
-
 endif