3 files changed, 14 insertions, 8 deletions
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"
diff --git a/templates/feature/agl-ic-container/50_local.conf.inc b/templates/feature/agl-ic-container/50_local.conf.inc
index dce87a49..4bca5cbd 100644
--- a/templates/feature/agl-ic-container/50_local.conf.inc
+++ b/templates/feature/agl-ic-container/50_local.conf.inc
@@ -1,8 +1,2 @@
-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"
+#see meta-agl-devel/meta-agl-ic-container/conf/include/agl-ic-container.inc
+require conf/include/agl-ic-container.inc