add support for build system overlays that alter package build instructions currently...

SVN-Revision: 17445

diff --git a/include/package.mk b/include/package.mk
index 22808654db6e037b5fb64ee1fa4b78ef76ae7f4e..7cfe6979377785cd3b31d26ca9bb9c1d42ec055a 100644 (file)
--- 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 78a03d877f9173f754d6ee3cdb41a0e44800c88d..d8b16d1d90f408991b33ae7d271c6d4a5e8a37af 100644 (file)
--- 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; \