[x86] target/patches: This has been sent upstream, but might not appear for a couple...

[openwrt.git] / target / sdk / files / package / rules.mk

diff --git a/target/sdk/files/package/rules.mk b/target/sdk/files/package/rules.mk
index b3f4cdb..7adb2e3 100644 (file)
--- a/target/sdk/files/package/rules.mk
+++ b/target/sdk/files/package/rules.mk
@@ -1,7 +1,13 @@
 # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
 # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 

-IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc $(SCRIPT_DIR)/ipkg -force-defaults -force-depends

 IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
 
 IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
 

+# invoke ipkg-build with some default options
+IPKG_BUILD := PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root
+
+# where to build (and put) .ipk packages
+IPKG_TARGET_DIR := $(PACKAGE_DIR)
+

 ifneq ($(DUMP),)
 dump:
 .PHONY: dump
 ifneq ($(DUMP),)
 dump:
 .PHONY: dump


@@ -15,7 +21,7 @@ INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list
 ifneq ($(BR2_PACKAGE_$(1)),)
 compile-targets: $$(IPKG_$(1))
 endif
 ifneq ($(BR2_PACKAGE_$(1)),)
 compile-targets: $$(IPKG_$(1))
 endif

-ifneq ($(DEVELOPER),)
+ifneq ($(DEVELOPER)$(SDK),)

 compile-targets: $$(IPKG_$(1))
 endif
 ifeq ($(BR2_PACKAGE_$(1)),y)
 compile-targets: $$(IPKG_$(1))
 endif
 ifeq ($(BR2_PACKAGE_$(1)),y)


@@ -51,7 +57,7 @@ ifneq ($(strip $(PKG_CAT)),)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)

-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)

        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi
        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi