aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-08-31 01:11:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-08-31 01:11:25 +0000
commit5af113eb7c0f6e4b2d09e536e1a2adc4e2d6071d (patch)
tree96d48a11f9d8a0fa99919569c0501b1308a7a153
parent15b832c0b7bba20c2b80826e3aaa458cb103cb22 (diff)
downloadupstream-5af113eb7c0f6e4b2d09e536e1a2adc4e2d6071d.tar.gz
upstream-5af113eb7c0f6e4b2d09e536e1a2adc4e2d6071d.tar.bz2
upstream-5af113eb7c0f6e4b2d09e536e1a2adc4e2d6071d.zip
add support for build system overlays that alter package build instructions currently unused, will probably be managed by the feeds system later
SVN-Revision: 17445
-rw-r--r--include/package.mk7
-rw-r--r--include/toplevel.mk2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk
index 22808654db..7cfe697937 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -145,7 +145,14 @@ define Build/DefaultTargets
distcheck: $(STAMP_CONFIGURED)
endef
+define Build/IncludeOverlay
+ $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_NAME).mk))
+ define Build/IncludeOverlay
+ endef
+endef
+
define BuildPackage
+ $(Build/IncludeOverlay)
$(eval $(Package/Default))
$(eval $(Package/$(1)))
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 78a03d877f..d8b16d1d90 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -43,7 +43,7 @@ prepare-mk: FORCE ;
prepare-tmpinfo: FORCE
mkdir -p tmp/info
- $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
+ $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
for type in package target; do \
f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \