X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fsdk%2Ffiles%2Fpackage%2Frules.mk;h=7adb2e3797507717f7dca4c3253e614436e54c6f;hb=ec3dfcb255d444f7c6dfa1d41bf32e7bf17c8065;hp=b3f4cdbea9b7c328d689aee886a560f202121f64;hpb=30010567953c3acfa28c2beafe50e6177254eefa;p=openwrt-10.03%2F.git diff --git a/target/sdk/files/package/rules.mk b/target/sdk/files/package/rules.mk index b3f4cdbea..7adb2e379 100644 --- 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 -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 +# 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 @@ -15,7 +21,7 @@ INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list ifneq ($(BR2_PACKAGE_$(1)),) compile-targets: $$(IPKG_$(1)) endif -ifneq ($(DEVELOPER),) +ifneq ($(DEVELOPER)$(SDK),) 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_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