diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-03 06:46:44 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-03 06:46:44 +0000 |
| commit | 39a3cef8d7b310d70cca42e393ab565951cef8b3 (patch) | |
| tree | 5914d1dd2e09d7d49618b597538ce92e7c85344f | |
| parent | 44ba00bfa11307e9fef4be7da732dc166fe32c09 (diff) | |
move ipkg related vars from ./rules.mk to ./include/package-ipkg.mk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8581 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 12 | ||||
| -rw-r--r-- | rules.mk | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index cc9a780147..452ae5032d 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -5,6 +5,18 @@ # See /LICENSE for more information. # +# where to build (and put) .ipk packages +IPKG:= \ + IPKG_TMP=$(TMP_DIR)/ipkg \ + IPKG_INSTROOT=$(TARGET_DIR) \ + IPKG_CONF_DIR=$(STAGING_DIR)/etc \ + IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ + $(SCRIPT_DIR)/ipkg -force-defaults -force-depends + +# invoke ipkg-build with some default options +IPKG_BUILD:= \ + ipkg-build -c -o 0 -g 0 + define BuildIPKGVariable $(call shexport,Package/$(1)/$(2)) $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); @@ -107,18 +107,6 @@ RSTRIP:= \ STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \ $(SCRIPT_DIR)/rstrip.sh -# where to build (and put) .ipk packages -IPKG:= \ - IPKG_TMP=$(TMP_DIR)/ipkg \ - IPKG_INSTROOT=$(TARGET_DIR) \ - IPKG_CONF_DIR=$(STAGING_DIR)/etc \ - IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ - $(SCRIPT_DIR)/ipkg -force-defaults -force-depends - -# invoke ipkg-build with some default options -IPKG_BUILD:= \ - ipkg-build -c -o 0 -g 0 - ifeq ($(CONFIG_ENABLE_LOCALE),true) DISABLE_NLS:= else |