From 0b46552625959b829d7f2712b642ef52003e5534 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 21 Feb 2022 10:36:13 -0800 Subject: meta: Rename LICENSE_FLAGS variable (From OE-Core rev: 5c5b3bc563059ba728dc9724656cc69669f8e25f) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 4 ++-- meta/classes/license.bbclass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 87a4cb5fc7..be820ddb2c 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -542,9 +542,9 @@ python () { unmatched_license_flags = check_license_flags(d) if unmatched_license_flags: if len(unmatched_license_flags) == 1: - message = "because it has a restricted license '{0}'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST".format(unmatched_license_flags[0]) + message = "because it has a restricted license '{0}'. Which is not whitelisted in LICENSE_FLAGS_ACCEPTED".format(unmatched_license_flags[0]) else: - message = "because it has restricted licenses {0}. Which are not whitelisted in LICENSE_FLAGS_WHITELIST".format( + message = "because it has restricted licenses {0}. Which are not whitelisted in LICENSE_FLAGS_ACCEPTED".format( ", ".join("'{0}'".format(f) for f in unmatched_license_flags)) bb.debug(1, "Skipping %s %s" % (pn, message)) raise bb.parse.SkipRecipe(message) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d5480d87e2..dd1e07ee37 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -392,7 +392,7 @@ def check_license_flags(d): license_flags = d.getVar('LICENSE_FLAGS') if license_flags: - whitelist = d.getVar('LICENSE_FLAGS_WHITELIST') + whitelist = d.getVar('LICENSE_FLAGS_ACCEPTED') if not whitelist: return license_flags.split() unmatched_flags = all_license_flags_match(license_flags, whitelist) -- cgit v1.2.3-54-g00ecf