Skip to content

Commit 889c20c

Browse files
committed
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] foundriesio/meta-lmp#1618 Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
1 parent bfb6e73 commit 889c20c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

lmp/bb-config.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,19 @@ EOFEOF
189189
fi
190190

191191
if [ "${DISABLE_GPLV3}" = "1" ]; then
192-
cat << EOFEOF >> conf/local.conf
192+
if [ -f ../layers/meta-lmp-base/classes/lmp-no-gplv3.bbclass ]; then
193+
cat << EOFEOF >> conf/local.conf
194+
INHERIT += "lmp-no-gplv3"
195+
EOFEOF
196+
else
197+
cat << EOFEOF >> conf/local.conf
193198
INHERIT += "image-license-checker lmp-disable-gplv3"
194199
IMAGE_LICENSE_CHECKER_ROOTFS_BLACKLIST = "GPL-3.0 LGPL-3.0 AGPL-3.0"
195200
IMAGE_LICENSE_CHECKER_NON_ROOTFS_BLACKLIST = "GPL-3.0 LGPL-3.0 AGPL-3.0"
196201
IMAGE_LICENSE_CHECKER_ROOTFS_DENYLIST = "GPL-3.0-only GPL-3.0-or-later LGPL-3.0* AGPL-3.0*"
197202
IMAGE_LICENSE_CHECKER_NON_ROOTFS_DENYLIST = "GPL-3.0-only GPL-3.0-or-later LGPL-3.0* AGPL-3.0*"
198203
EOFEOF
204+
fi
199205
fi
200206

201207
sstate_mirror="https://storage.googleapis.com/lmp-cache/v${LMP_VERSION_CACHE}-sstate-cache"

0 commit comments

Comments
 (0)