RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-01-18 12:32:57 +01:00
parent 797e5c1c48
commit 2d9d57b9de
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/feeds.mk
View File

@ -6,7 +6,7 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
-include $(TMP_DIR)/.packagesubdirs -include $(TMP_DIR)/.packageauxvars
FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n)) FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))

4
include/toplevel.mk
View File

@ -88,9 +88,9 @@ prepare-tmpinfo: FORCE
f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \ 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; }; \ [ "$$t" -nt "$$f" ] || ./scripts/$${type}-metadata.pl $(_ignore) config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
done 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 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 touch $(TOPDIR)/tmp/.build
.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo) .config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)

6
scripts/package-metadata.pl
View File

@ -509,7 +509,7 @@ sub gen_package_source() {
} }
} }
sub gen_package_subdirs() { sub gen_package_auxiliary() {
parse_package_metadata($ARGV[0]) or exit 1; parse_package_metadata($ARGV[0]) or exit 1;
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $pkg = $package{$name}; my $pkg = $package{$name};
@ -565,7 +565,7 @@ sub parse_command() {
/^config$/ and return gen_package_config(); /^config$/ and return gen_package_config();
/^kconfig/ and return gen_kconfig_overrides(); /^kconfig/ and return gen_kconfig_overrides();
/^source$/ and return gen_package_source(); /^source$/ and return gen_package_source();
/^subdirs$/ and return gen_package_subdirs(); /^pkgaux$/ and return gen_package_auxiliary();
/^license$/ and return gen_package_license(0); /^license$/ and return gen_package_license(0);
/^licensefull$/ and return gen_package_license(1); /^licensefull$/ and return gen_package_license(1);
/^usergroup$/ and return gen_usergroup_list(); /^usergroup$/ and return gen_usergroup_list();
@ -577,7 +577,7 @@ Available Commands:
$0 config [file] Package metadata in Kconfig format $0 config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] [patchver] Kernel config overrides $0 kconfig [file] [config] [patchver] Kernel config overrides
$0 source [file] Package source file information $0 source [file] Package source file information
$0 subdirs [file] Package subdir information in makefile format $0 pkgaux [file] Package auxiliary variables in makefile format
$0 license [file] Package license information $0 license [file] Package license information
$0 licensefull [file] Package license information (full list) $0 licensefull [file] Package license information (full list)
$0 usergroup [file] Package usergroup allocation list $0 usergroup [file] Package usergroup allocation list