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 --- meta-agl-ic-container/conf/layer.conf | 17 ++++++++++++ .../conf/multiconfig/agl-container-cluster.conf | 29 ++++++++++++++++++++ .../conf/multiconfig/agl-container-guest.conf | 23 ++++++++++++++++ .../conf/multiconfig/agl-container-ivi.conf | 32 ++++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 meta-agl-ic-container/conf/layer.conf create mode 100644 meta-agl-ic-container/conf/multiconfig/agl-container-cluster.conf create mode 100644 meta-agl-ic-container/conf/multiconfig/agl-container-guest.conf create mode 100644 meta-agl-ic-container/conf/multiconfig/agl-container-ivi.conf (limited to 'meta-agl-ic-container/conf') diff --git a/meta-agl-ic-container/conf/layer.conf b/meta-agl-ic-container/conf/layer.conf new file mode 100644 index 00000000..acf7dbbe --- /dev/null +++ b/meta-agl-ic-container/conf/layer.conf @@ -0,0 +1,17 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH =. "${LAYERDIR}:" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "aglcontainermc" +BBFILE_PATTERN_aglcontainermc = "^${LAYERDIR}/" +BBFILE_PRIORITY_aglcontainermc = "100" + +BBFILES_DYNAMIC += " \ + rcar-gen3:${LAYERDIR}/dynamic-layers/meta-rcar-gen3/*/*/*.bb \ + rcar-gen3:${LAYERDIR}/dynamic-layers/meta-rcar-gen3/*/*/*.bbappend \ +" + +LAYERSERIES_COMPAT_aglcontainermc = "kirkstone" diff --git a/meta-agl-ic-container/conf/multiconfig/agl-container-cluster.conf b/meta-agl-ic-container/conf/multiconfig/agl-container-cluster.conf new file mode 100644 index 00000000..29272c78 --- /dev/null +++ b/meta-agl-ic-container/conf/multiconfig/agl-container-cluster.conf @@ -0,0 +1,29 @@ +# The aglcontainerguest is a common keyword for agl container. +OVERRIDES:append = ":aglcontainerguest" + +# The aglcontainercluster is specific keyword for cluster guest. +OVERRIDES:append = ":aglcontainercluster" + +TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}" + +# Can be blank as container image type results in a .tar.bz2 +AGL_DEFAULT_IMAGE_FSTYPES = "" +AGL_EXTRA_IMAGE_FSTYPES = "" + +IMAGE_FSTYPES:aglcontainerguest = "container" + +IMAGE_LINGUAS:append:aglcontainercluster = " en-us" + +PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy" +KERNEL_DEVICETREE:aglcontainercluster = "" + +# Disable serial consoles +SERIAL_CONSOLES:aglcontainerguest = "" + +# Remove unneeded firmware packages +EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot" + +# We assume rngd is running on the host, so unnecessary in container +VIRTUAL-RUNTIME_rngd = "" + +hostname:append:aglcontainercluster = "-cluster" diff --git a/meta-agl-ic-container/conf/multiconfig/agl-container-guest.conf b/meta-agl-ic-container/conf/multiconfig/agl-container-guest.conf new file mode 100644 index 00000000..db25b3b7 --- /dev/null +++ b/meta-agl-ic-container/conf/multiconfig/agl-container-guest.conf @@ -0,0 +1,23 @@ +OVERRIDES:append = ":aglcontainerguest" + +TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}" + +# Can be blank as container image type results in a .tar.bz2 +AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerguest = "" +AGL_EXTRA_IMAGE_FSTYPES:aglcontainerguest = "" + +IMAGE_FSTYPES:aglcontainerguest = "container" + +IMAGE_LINGUAS:append:aglcontainerguest = " en-us" + +PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy" +KERNEL_DEVICETREE:aglcontainerguest = "" + +# Disable serial consoles +SERIAL_CONSOLES:aglcontainerguest = "" + +# Remove unneeded firmware packages +EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot" + +# We assume rngd is running on the host, so unnecessary in container +VIRTUAL-RUNTIME_rngd = "" diff --git a/meta-agl-ic-container/conf/multiconfig/agl-container-ivi.conf b/meta-agl-ic-container/conf/multiconfig/agl-container-ivi.conf new file mode 100644 index 00000000..4553e7a2 --- /dev/null +++ b/meta-agl-ic-container/conf/multiconfig/agl-container-ivi.conf @@ -0,0 +1,32 @@ +# The aglcontainerguest is a common keyword for agl container. +OVERRIDES:append = ":aglcontainerguest" + +# The aglcontainerivi is specific keyword for ivi guest. +OVERRIDES:append = ":aglcontainerivi" + +TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}" + +# Can be blank as container image type results in a .tar.bz2 +AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerivi = "" +AGL_EXTRA_IMAGE_FSTYPES:aglcontainerivi = "" + +IMAGE_FSTYPES:aglcontainerguest = "container" + +IMAGE_LINGUAS:append:aglcontainerivi = " en-us" + +PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy" +KERNEL_DEVICETREE:aglcontainerivi = "" + +# Disable serial consoles +SERIAL_CONSOLES:aglcontainerguest = "" + +# Remove unneeded firmware packages +EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot" + +# We assume rngd is running on the host, so unnecessary in container +VIRTUAL-RUNTIME_rngd = "" + +# network manager to use +VIRTUAL-RUNTIME_net_manager = "systemd" + +hostname:append:aglcontainerivi = "-ivi" -- cgit 1.2.3-korg