revert r22372 and r22405, dependency on host libtool causes problems

[openwrt/staging/dedeckeh.git] / target / imagebuilder / files / Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 2e1e82f866ad071f6eda2ad0b966d1e898fad207..b72e3f1724162f73d4f2be16c1b6e8e9ed3d3c4b 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -52,15 +52,12 @@ help: FORCE
 
 # override variables from rules.mk
 PACKAGE_DIR:=$(TOPDIR)/packages
-OPKG:= \
+IPKG:= \
   IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \
   IPKG_INSTROOT="$(TARGET_DIR)" \
   IPKG_CONF_DIR="$(TOPDIR)/tmp" \
   IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
-  $(STAGING_DIR_HOST)/bin/opkg \
-       -f $(TOPDIR)/tmp/opkg.conf \
-       --force-depends \
-       --force-overwrite
+  $(SCRIPT_DIR)/ipkg -force-defaults
 
 define Profile
   $(eval $(call Profile/Default))
@@ -82,18 +79,10 @@ _call_info: FORCE
        echo 'Available Profiles:'
        echo; $(PROFILE_LIST)
 
-$(TOPDIR)/tmp/opkg.conf: FORCE
+$(TOPDIR)/tmp/ipkg.conf: FORCE
        @mkdir -p $(TOPDIR)/tmp
-       @mkdir -p $(TARGET_DIR)/tmp
        @echo 'dest root /' > $@
        @echo 'src packages file:$(PACKAGE_DIR)' >> $@
-       @echo 'arch all 100' >> $@
-  ifneq ($(CONFIG_TARGET_adm5120),y)
-       @echo 'arch $(BOARD) 200' >> $@
-  else
-       @echo 'arch $(BOARD)_$(ARCH) 200' >> $@
-  endif
-       @echo 'option offline_root $(TARGET_DIR)' >> $@
 
 BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
 # "-pkgname" in the package list means remove "pkgname" from the package list
@@ -113,18 +102,18 @@ endif
        $(MAKE) package_postinst
        $(MAKE) build_image
        
-package_index: $(TOPDIR)/tmp/opkg.conf FORCE
+package_index: $(TOPDIR)/tmp/ipkg.conf FORCE
        @echo
        @echo Building package index...
        (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
                gzip -9c Packages > Packages.gz \
        ) >/dev/null 2>/dev/null
-       $(OPKG) update
+       $(IPKG) update
 
 package_install: FORCE
        @echo
        @echo Installing packages...
-       $(OPKG) install $(BUILD_PACKAGES)
+       $(IPKG) install $(BUILD_PACKAGES)
 
 copy_files: FORCE
        @echo
@@ -132,9 +121,6 @@ copy_files: FORCE
        $(CP) $(USER_FILES)/* $(TARGET_DIR)/
 
 package_postinst: FORCE
-       @echo
-       @echo Cleaning up
-       @rm -f $(TARGET_DIR)/tmp/opkg.lock
        @echo
        @echo Activating init scripts
        @( \