aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-22 21:31:37 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-07 08:58:40 +0200
commit9ae952cf8cf2f0d7df95434c8b16d13bc1b47fca (patch)
treebddaea12a78ddd55708a508c02bfb74552bbc7ed /include
parent1a3c56f8322d27f4652d23eb7dc14a45e1631e1c (diff)
downloadupstream-9ae952cf8cf2f0d7df95434c8b16d13bc1b47fca.tar.gz
upstream-9ae952cf8cf2f0d7df95434c8b16d13bc1b47fca.tar.bz2
upstream-9ae952cf8cf2f0d7df95434c8b16d13bc1b47fca.zip
build: split scripts/metadata.pl into target-metadata.pl and package-metadata.pl
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
-rw-r--r--include/kernel-defaults.mk2
-rw-r--r--include/kernel.mk2
-rw-r--r--include/toplevel.mk6
3 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 406fd46343..3679daeb84 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -111,7 +111,7 @@ define Kernel/Configure/Default
echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
echo "CONFIG_KALLSYMS_UNCOMPRESSED=y" >> $(LINUX_DIR)/.config.target
- $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
+ $(SCRIPT_DIR)/package-metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
$(call Kernel/SetNoInitramfs)
rm -rf $(KERNEL_BUILD_DIR)/modules
diff --git a/include/kernel.mk b/include/kernel.mk
index 2b87aeba33..8ce4df8f2d 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -215,7 +215,7 @@ $(call KernelPackage/$(1)/config)
$$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
endef
-version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1))
+version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/package-metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1))
define AutoLoad
add_module "$(1)" "$(call version_filter,$(2))" "$(3)";
diff --git a/include/toplevel.mk b/include/toplevel.mk
index e00a24ab6a..581083d912 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -81,11 +81,11 @@ prepare-tmpinfo: FORCE
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="image/Makefile 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; \
- [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $(_ignore) $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+ [ "$$t" -nt "$$f" ] || ./scripts/$${type}-metadata.pl $(_ignore) config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
done
[ tmp/.config-feeds.in -nt tmp/.packagesubdirs ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
- ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
- ./scripts/metadata.pl package_subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; }
+ ./scripts/package-metadata.pl mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+ ./scripts/package-metadata.pl subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; }
touch $(TOPDIR)/tmp/.build
.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)