From 2d9d57b9de230e1f397c1396f4fb7dfae34d3855 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 18 Jan 2019 12:32:57 +0100 Subject: build: rename .packagesubdirs to .packageauxvars Subsequent commits will put more auxiliary information into this file, such as the per-package ABI version, so rename the metadata script subcommand and file names accordingly. Signed-off-by: Jo-Philipp Wich --- include/toplevel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/toplevel.mk') diff --git a/include/toplevel.mk b/include/toplevel.mk index b57dcd8544..36f790f807 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -88,9 +88,9 @@ prepare-tmpinfo: FORCE f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \ [ "$$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 + [ tmp/.config-feeds.in -nt tmp/.packageauxvars ] || ./scripts/feeds feed_config > tmp/.config-feeds.in ./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; } + ./scripts/package-metadata.pl pkgaux tmp/.packageinfo > tmp/.packageauxvars || { rm -f tmp/.packageauxvars; false; } touch $(TOPDIR)/tmp/.build .config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo) -- cgit v1.2.3