summaryrefslogtreecommitdiffstats
path: root/meta-agl-lxc/conf
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-08-09 11:33:17 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-08-09 15:43:04 +0200
commit13169c3265ba75d783eb3723504298a08e768110 (patch)
tree9f30b921d3491ad9bc8a55d58fd3bf6f3db8800e /meta-agl-lxc/conf
parentce87122d195d3a1fea454cfa4acd91e22ccea264 (diff)
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-<ivi,cluster,telematics>-demo-* . But keep the names of the underlying images as-is. Bug-AGL: SPEC-4464 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b
Diffstat (limited to 'meta-agl-lxc/conf')
-rw-r--r--meta-agl-lxc/conf/layer.conf17
-rw-r--r--meta-agl-lxc/conf/multiconfig/agl-container-cluster.conf29
-rw-r--r--meta-agl-lxc/conf/multiconfig/agl-container-guest.conf23
-rw-r--r--meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf32
4 files changed, 0 insertions, 101 deletions
diff --git a/meta-agl-lxc/conf/layer.conf b/meta-agl-lxc/conf/layer.conf
deleted file mode 100644
index acf7dbbe..00000000
--- a/meta-agl-lxc/conf/layer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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-lxc/conf/multiconfig/agl-container-cluster.conf b/meta-agl-lxc/conf/multiconfig/agl-container-cluster.conf
deleted file mode 100644
index 29272c78..00000000
--- a/meta-agl-lxc/conf/multiconfig/agl-container-cluster.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-lxc/conf/multiconfig/agl-container-guest.conf b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
deleted file mode 100644
index db25b3b7..00000000
--- a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-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-lxc/conf/multiconfig/agl-container-ivi.conf b/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf
deleted file mode 100644
index 4553e7a2..00000000
--- a/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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"