summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-10-03 18:39:37 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-10-03 18:48:11 +0200
commit95eab960fce69f29da5521297b3b9840096c055a (patch)
treed6714bb5ab296b8eeaba79168ecb7dcf2a364e0a
parentbd33fe9afd8af95c55257d6a75f89273fd9ceb99 (diff)
downloadptxdist-95eab960fce69f29da5521297b3b9840096c055a.tar.gz
ptxdist-95eab960fce69f29da5521297b3b9840096c055a.tar.xz
rules: add PTX_PACKAGES_ALL and PTX_PACKAGES_DISABLED
Note: we cannot determine PTX_PACKAGES_DISABLED using PACKAGES- etc. With the way various packages handle platform specific exceptions, this would result in missing or dplicate packages. Instead, list all packages in ptxd_lib_dgen and filter out the enabled packages. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/other/Toplevel.make3
-rw-r--r--scripts/lib/ptxd_lib_dgen.awk3
2 files changed, 6 insertions, 0 deletions
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index 857500d11..ad639357d 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -121,6 +121,9 @@ PTX_PACKAGES_SELECTED := \
$(EXTRA_PACKAGES) \
$(LAZY_PACKAGES)
+PTX_PACKAGES_DISABLED := \
+ $(filter-out $(PTX_PACKAGES_SELECTED),$(PTX_PACKAGES_ALL))
+
PTX_PACKAGES_INSTALL := \
$(PACKAGES)
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index 8908d77bd..2c6c80a69 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -554,6 +554,7 @@ END {
print "include " PTXDIST_TEMPDIR "/pkghash.make" > DGEN_DEPS_POST;
# for all pkgs
+ all_pkg = ""
for (this_PKG in PKG_to_pkg) {
this_pkg = PKG_to_pkg[this_PKG];
this_pkg_prefix = gensub(/^(host-|cross-|image-|).*/, "\\1", 1, this_pkg)
@@ -565,7 +566,9 @@ END {
write_deps_pkg_all(this_PKG, this_pkg)
write_vars_pkg_all(this_PKG, this_pkg, this_pkg_prefix)
}
+ all_pkg = all_pkg " " this_pkg
}
+ print "PTX_PACKAGES_ALL := " all_pkg > DGEN_DEPS_PRE;
# for active pkgs
for (this_PKG in active_PKG_to_pkg) {