From 13169c3265ba75d783eb3723504298a08e768110 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 9 Aug 2022 11:33:17 +0200 Subject: Rename Instrument Cluster Container layer meta-agl-lxc is no longer reflecting the actual content and use of the layer. Rename it to 'meta-agl-ic-container' and the feature to 'agl-ic-container'. Also rename the main image to 'agl-cluster-demo-lxc-host' to match the pattern used by all other images e.g. agl--demo-* . But keep the names of the underlying images as-is. Bug-AGL: SPEC-4464 Signed-off-by: Jan-Simon Moeller Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b --- templates/feature/agl-ic-container/50_bblayers.conf.inc | 9 +++++++++ templates/feature/agl-ic-container/50_local.conf.inc | 8 ++++++++ .../agl-ic-container/README_feature_agl-ic-container.md | 14 ++++++++++++++ templates/feature/agl-ic-container/included.dep | 1 + templates/feature/agl-lxc/50_bblayers.conf.inc | 9 --------- templates/feature/agl-lxc/50_local.conf.inc | 8 -------- templates/feature/agl-lxc/README_feature_agl-lxc.md | 14 -------------- templates/feature/agl-lxc/included.dep | 1 - 8 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 templates/feature/agl-ic-container/50_bblayers.conf.inc create mode 100644 templates/feature/agl-ic-container/50_local.conf.inc create mode 100644 templates/feature/agl-ic-container/README_feature_agl-ic-container.md create mode 100644 templates/feature/agl-ic-container/included.dep delete mode 100644 templates/feature/agl-lxc/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-lxc/50_local.conf.inc delete mode 100644 templates/feature/agl-lxc/README_feature_agl-lxc.md delete mode 100644 templates/feature/agl-lxc/included.dep (limited to 'templates/feature') diff --git a/templates/feature/agl-ic-container/50_bblayers.conf.inc b/templates/feature/agl-ic-container/50_bblayers.conf.inc new file mode 100644 index 00000000..09da3253 --- /dev/null +++ b/templates/feature/agl-ic-container/50_bblayers.conf.inc @@ -0,0 +1,9 @@ +AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" +AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems" +AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization" + +BBLAYERS =+ " \ + ${METADIR}/external/meta-qt5 \ + ${METADIR}/meta-agl-devel/meta-agl-ic-container \ +" diff --git a/templates/feature/agl-ic-container/50_local.conf.inc b/templates/feature/agl-ic-container/50_local.conf.inc new file mode 100644 index 00000000..dce87a49 --- /dev/null +++ b/templates/feature/agl-ic-container/50_local.conf.inc @@ -0,0 +1,8 @@ +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" diff --git a/templates/feature/agl-ic-container/README_feature_agl-ic-container.md b/templates/feature/agl-ic-container/README_feature_agl-ic-container.md new file mode 100644 index 00000000..e5b5391c --- /dev/null +++ b/templates/feature/agl-ic-container/README_feature_agl-ic-container.md @@ -0,0 +1,14 @@ +--- +description: Feature agl-lxc +authors: Tadao Tanikawa +--- + +### Feature agl-lxc + +*Description is missing - please complete file meta-agl-devel/templates/feature/agl-lxc/README_feature_agl-lxc.md* + +### Dependent features pulled by agl-lxc + +The following features are pulled: + +* agl-container diff --git a/templates/feature/agl-ic-container/included.dep b/templates/feature/agl-ic-container/included.dep new file mode 100644 index 00000000..da46a102 --- /dev/null +++ b/templates/feature/agl-ic-container/included.dep @@ -0,0 +1 @@ +agl-drm-lease agl-pipewire diff --git a/templates/feature/agl-lxc/50_bblayers.conf.inc b/templates/feature/agl-lxc/50_bblayers.conf.inc deleted file mode 100644 index de0b2864..00000000 --- a/templates/feature/agl-lxc/50_bblayers.conf.inc +++ /dev/null @@ -1,9 +0,0 @@ -AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" -AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" -AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems" -AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization" - -BBLAYERS =+ " \ - ${METADIR}/external/meta-qt5 \ - ${METADIR}/meta-agl-devel/meta-agl-lxc \ -" diff --git a/templates/feature/agl-lxc/50_local.conf.inc b/templates/feature/agl-lxc/50_local.conf.inc deleted file mode 100644 index dce87a49..00000000 --- a/templates/feature/agl-lxc/50_local.conf.inc +++ /dev/null @@ -1,8 +0,0 @@ -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" diff --git a/templates/feature/agl-lxc/README_feature_agl-lxc.md b/templates/feature/agl-lxc/README_feature_agl-lxc.md deleted file mode 100644 index e5b5391c..00000000 --- a/templates/feature/agl-lxc/README_feature_agl-lxc.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -description: Feature agl-lxc -authors: Tadao Tanikawa ---- - -### Feature agl-lxc - -*Description is missing - please complete file meta-agl-devel/templates/feature/agl-lxc/README_feature_agl-lxc.md* - -### Dependent features pulled by agl-lxc - -The following features are pulled: - -* agl-container diff --git a/templates/feature/agl-lxc/included.dep b/templates/feature/agl-lxc/included.dep deleted file mode 100644 index da46a102..00000000 --- a/templates/feature/agl-lxc/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-drm-lease agl-pipewire -- cgit 1.2.3-korg