From 889c20c114a1eb7538c696e759d5abc153d9e1a6 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 7 Apr 2025 15:51:57 +0100 Subject: [PATCH] lmp/bb-config: add support to the lmp-no-gplv3 With [1] we replace the bitbake bbclass image-license-checker and lmp-disable-gplv3 bbclass with the lmp-no-gplv3 bbclass which also includes definitions implemented in oe-core. The IMAGE_LICENSE_CHECKER_* is not need anymore and the control is made now with the variable IMAGE_INCOMPATIBLE_LICENSE. [1] https://github.com/foundriesio/meta-lmp/pull/1618 Signed-off-by: Jose Quaresma --- lmp/bb-config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lmp/bb-config.sh b/lmp/bb-config.sh index 10843142..d439060f 100755 --- a/lmp/bb-config.sh +++ b/lmp/bb-config.sh @@ -189,13 +189,19 @@ EOFEOF fi if [ "${DISABLE_GPLV3}" = "1" ]; then - cat << EOFEOF >> conf/local.conf + if [ -f ../layers/meta-lmp-base/classes/lmp-no-gplv3.bbclass ]; then + cat << EOFEOF >> conf/local.conf +INHERIT += "lmp-no-gplv3" +EOFEOF + else + cat << EOFEOF >> conf/local.conf INHERIT += "image-license-checker lmp-disable-gplv3" IMAGE_LICENSE_CHECKER_ROOTFS_BLACKLIST = "GPL-3.0 LGPL-3.0 AGPL-3.0" IMAGE_LICENSE_CHECKER_NON_ROOTFS_BLACKLIST = "GPL-3.0 LGPL-3.0 AGPL-3.0" IMAGE_LICENSE_CHECKER_ROOTFS_DENYLIST = "GPL-3.0-only GPL-3.0-or-later LGPL-3.0* AGPL-3.0*" IMAGE_LICENSE_CHECKER_NON_ROOTFS_DENYLIST = "GPL-3.0-only GPL-3.0-or-later LGPL-3.0* AGPL-3.0*" EOFEOF + fi fi sstate_mirror="https://storage.googleapis.com/lmp-cache/v${LMP_VERSION_CACHE}-sstate-cache"