Преглед изворни кода

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
Felix Fietkau пре 16 година
родитељ
комит
5af113eb7c
2 измењених фајлова са 8 додато и 1 уклоњено
  1. 7 0
      include/package.mk
  2. 1 1
      include/toplevel.mk

+ 7 - 0
include/package.mk

@@ -145,7 +145,14 @@ define Build/DefaultTargets
   distcheck: $(STAMP_CONFIGURED)
   distcheck: $(STAMP_CONFIGURED)
 endef
 endef
 
 
+define Build/IncludeOverlay
+  $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_NAME).mk))
+  define Build/IncludeOverlay
+  endef
+endef
+
 define BuildPackage
 define BuildPackage
+  $(Build/IncludeOverlay)
   $(eval $(Package/Default))
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
   $(eval $(Package/$(1)))
 
 

+ 1 - 1
include/toplevel.mk

@@ -43,7 +43,7 @@ prepare-mk: FORCE ;
 
 
 prepare-tmpinfo: FORCE
 prepare-tmpinfo: FORCE
 	mkdir -p tmp/info
 	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"
 	$(_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 \
 	for type in package target; do \
 		f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
 		f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \