From 11d8e26de30e8c35bde8a0560f71e33055d1d5bf 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 new lmp no-gplv3 config With [1] we droped the bitbake image-license-checker and lmp-disable-gplv3 bbclass. So add support to the new lmp no-gplv3 config. [1] https://github.com/foundriesio/meta-lmp/pull/1618 Signed-off-by: Jose Quaresma --- lmp/bb-config.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lmp/bb-config.sh b/lmp/bb-config.sh index 4c40f71e..aca1a79d 100755 --- a/lmp/bb-config.sh +++ b/lmp/bb-config.sh @@ -189,13 +189,20 @@ EOFEOF fi if [ "${DISABLE_GPLV3}" = "1" ]; then - cat << EOFEOF >> conf/local.conf + # support the new lmp no-gplv3 config + if [ -f ../layers/meta-lmp-base/conf/distro/include/lmp-no-gplv3.inc ]; then + cat << EOFEOF >> conf/local.conf +require conf/distro/include/lmp-no-gplv3.inc +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"