summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2016-11-08 15:21:18 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-11-09 14:09:15 +0100
commitc80be22614df7d176a852afdcb9c3f817f75d647 (patch)
tree624f486f6c6398062d653a7a398c07afece3ad2b
parent71da9efbc071a8eb26d4e326a735ba8e40efc7d8 (diff)
downloadptxdist-c80be22614df7d176a852afdcb9c3f817f75d647.tar.gz
ptxdist-c80be22614df7d176a852afdcb9c3f817f75d647.tar.xz
License report: prevent unintended buildptxdist-2016.11.0
Independently from the PTXCONF_PROJECT_CHECK_LICENSES setting the license was extracted from each package due to this '='/'==' mismatch. Also, move the check before the loop that modifies 'this_PKG'. Otherwise the check always fails. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_lib_dgen.awk5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index e5cdd2c63..f9c2d1c85 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -184,6 +184,9 @@ $1 ~ /^PTXCONF_/ {
if ($2 ~ /^[ym]$/ && this_PKG in PKG_to_pkg)
active_PKG_to_pkg[this_PKG] = PKG_to_pkg[this_PKG];
+ if (this_PKG == "PROJECT_CHECK_LICENSES")
+ CHECK_LICENSES = 1;
+
do {
if (this_PKG in PKG_to_pkg) {
next_PKG_HASHFILE = PTXDIST_TEMPDIR "/pkghash-" this_PKG;
@@ -196,8 +199,6 @@ $1 ~ /^PTXCONF_/ {
}
} while (sub(/_+[^_]+$/, "", this_PKG));
- if (this_PKG = "PROJECT_CHECK_LICENSES")
- CHECK_LICENSES = 1;
next;
}