From 95eab960fce69f29da5521297b3b9840096c055a Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 3 Oct 2019 18:39:37 +0200 Subject: 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 --- rules/other/Toplevel.make | 3 +++ scripts/lib/ptxd_lib_dgen.awk | 3 +++ 2 files changed, 6 insertions(+) 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) { -- cgit v1.2.1