From e66169bcd02c5637741d759792f5f999083ab28a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 13 Feb 2023 18:43:30 -0500 Subject: agl-ic-container: Fix host configuration when using agl-demo Changes: - Switch to pulling in a agl-ic-container.inc include file from the feature local.conf.inc template to simplify development. - Add include files for the host ("default" in BitBake) multiconfig to allow disabling agl-demo and related features in the host build. This reduces the impact on the host image when using the images from meta-agl-demo as guest containers. At present the "agl-selinux" feature is left alone, as support pretty much needs to be present in the host to allow using it at all. This likely needs to be investigated further and discussed with respect to the IC EG requirements. Bug-AGL: SPEC-4703 Change-Id: I833fa8754f0044552a8b775bcc06c4ccd3fcac3e Signed-off-by: Scott Murray --- meta-agl-ic-container/conf/include/agl-ic-container.inc | 10 ++++++++++ meta-agl-ic-container/conf/include/mc-conf-default.inc | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 meta-agl-ic-container/conf/include/agl-ic-container.inc create mode 100644 meta-agl-ic-container/conf/include/mc-conf-default.inc (limited to 'meta-agl-ic-container/conf/include') diff --git a/meta-agl-ic-container/conf/include/agl-ic-container.inc b/meta-agl-ic-container/conf/include/agl-ic-container.inc new file mode 100644 index 00000000..f7f02bbd --- /dev/null +++ b/meta-agl-ic-container/conf/include/agl-ic-container.inc @@ -0,0 +1,10 @@ +BBMULTICONFIG = "agl-container-cluster agl-container-ivi" + +# The meta-virtualization has a sanity-meta-virt check. +# This checker check 'DISTRO_FEATURES has virtualization', but +# in case of linux container is not necessary to the 'virtualization'. +# This should be revisited when upgrading past dunfell, as less of +# the extra configuration may be enabled in the future. +INHERIT:remove = "sanity-meta-virt" + +include mc-conf-${BB_CURRENT_MC}.inc diff --git a/meta-agl-ic-container/conf/include/mc-conf-default.inc b/meta-agl-ic-container/conf/include/mc-conf-default.inc new file mode 100644 index 00000000..1d3022e4 --- /dev/null +++ b/meta-agl-ic-container/conf/include/mc-conf-default.inc @@ -0,0 +1,2 @@ +# We don't want the app framework or demo bits in the host image. +AGL_FEATURES:remove = "agl-app-fw agldemo agl-flutter" -- cgit 1.2.3-korg