summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-31 01:11:25 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-31 01:11:25 +0000
commit8e82554c4f9a898abdf540188bd69086958c9410 (patch)
treeef26bae0690d1c1f6b8e49472e0014b45ac70203
parent4001a3f4617fc1614ce40f067eb4731bcee26299 (diff)
add support for build system overlays that alter package build instructions
currently unused, will probably be managed by the feeds system later git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17445 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 22808654d..7cfe69793 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 78a03d877..d8b16d1d9 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; \