From e47a8a001c37a32ac2ccd50bb9b6eae1c929fdfa Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 28 Jul 2010 02:18:16 +0000
Subject: revert r22372 and r22405, dependency on host libtool causes problems

SVN-Revision: 22406
---
 include/package-ipkg.mk | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 57b06c86d8..87b142aa59 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -1,20 +1,17 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006,2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 # where to build (and put) .ipk packages
-OPKG:= \
+IPKG:= \
   IPKG_TMP=$(TMP_DIR)/ipkg \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
   IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(STAGING_DIR_HOST)/bin/opkg \
-  	-f $(STAGING_DIR)/etc/opkg.conf \
-  	--force-depends \
-  	--force-overwrite
+  $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
@@ -79,7 +76,7 @@ ifeq ($(DUMP),)
 	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
 	touch $$@
 
-    $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT)
+    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
 	@rm -f $(PACKAGE_DIR)/$(1)_*
 	rm -rf $$(IDIR_$(1))
 	mkdir -p $$(IDIR_$(1))/CONTROL
@@ -114,8 +111,7 @@ ifeq ($(DUMP),)
 	@[ -f $$(IPKG_$(1)) ] || false 
 
     $$(INFO_$(1)): $$(IPKG_$(1))
-	@[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-	$(OPKG) install $$(IPKG_$(1))
+	$(IPKG) install $$(IPKG_$(1))
 
     $(1)-clean:
 	rm -f $(PACKAGE_DIR)/$(1)_*
@@ -124,11 +120,9 @@ ifeq ($(DUMP),)
 
   endef
 
-  $(STAGING_DIR)/etc/opkg.conf:
+  $(STAGING_DIR)/etc/ipkg.conf:
 	mkdir -p $(STAGING_DIR)/etc
-	( echo "dest root /"                        > $@; \
-	  echo "arch all 100"                      >> $@; \
-	  echo "arch $(PKGARCH) 200"               >> $@; \
-	  echo "option offline_root $(TARGET_DIR)" >> $@ )
+	echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
+	echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
 
 endif
-- 
cgit v1.2.3