Add amd64 detection when build host is a x86_64 machine, closes #390

[openwrt.git] / openwrt / toolchain / ipkg-utils / Makefile

diff --git a/openwrt/toolchain/ipkg-utils/Makefile b/openwrt/toolchain/ipkg-utils/Makefile
index 9568e8f..41c78fc 100644 (file)
--- a/openwrt/toolchain/ipkg-utils/Makefile
+++ b/openwrt/toolchain/ipkg-utils/Makefile
@@ -18,10 +18,10 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
 
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
 
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)

-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE)

 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)

-       mkdir -p $(TOOL_BUILD_DIR)
+       mkdir -p $(BUILD_DIR)

        $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        touch $(PKG_BUILD_DIR)/.unpacked
 
        $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        touch $(PKG_BUILD_DIR)/.unpacked
 


@@ -31,9 +31,9 @@ $(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
 
 $(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched
        mkdir -p $(STAGING_DIR)/etc
 
 $(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched
        mkdir -p $(STAGING_DIR)/etc

-       echo "dest root $(TARGET_DIR)" > $(STAGING_DIR)/etc/ipkg.conf
+       echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
+       echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf

        mkdir -p $(STAGING_DIR)/usr/bin
        mkdir -p $(STAGING_DIR)/usr/bin

-       install -m0755 $(TARGET_DIR)/bin/ipkg $(STAGING_DIR)/usr/bin

        install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin