From 606dc5ad6fcfe71aaf5d99d82c7f65094978825a Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Sep 2010 21:16:02 +0000
Subject: [package] opkg: 	- implement --add-dest and --add-arch
 commandline options, this allows to run entirely without configuration 
 - tweak default config location patch to not require a config in offline root
 mode 	- rename --force-run-hooks option to --force-postinstall, its a more
 appropriate name 	- utilize new opkg commandline options in
 package-ipkg.mk and remove config file generation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23032 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package-ipkg.mk | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'include/package-ipkg.mk')

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 0ac6bb53f..41f88d84d 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -12,11 +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:= \
@@ -81,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 -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
 	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
@@ -122,11 +124,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"			>> $@ )
-
 endif
-- 
cgit v1.2.3