summaryrefslogtreecommitdiffstats
path: root/meta-agl-lxc/recipes-platform
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/recipes-platform
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/recipes-platform')
-rw-r--r--meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb12
-rw-r--r--meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb30
-rw-r--r--meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb11
-rw-r--r--meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb31
-rw-r--r--meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb62
-rw-r--r--meta-agl-lxc/recipes-platform/packagegroups/packagegroup-agl-ic-core.bb17
6 files changed, 0 insertions, 163 deletions
diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb
deleted file mode 100644
index 1476d7ab..00000000
--- a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "LXC cluster demo guest image"
-LICENSE = "MIT"
-
-require guest-image-minimal.bb
-
-IMAGE_INSTALL += " \
- weston \
- weston-init-guest \
- weston-ini-conf-guest \
- cluster-refgui \
- pipewire-ic-ipc \
-"
diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb
deleted file mode 100644
index 22a59114..00000000
--- a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "LXC ivi demo guest image"
-LICENSE = "MIT"
-
-require guest-image-minimal.bb
-
-IMAGE_INSTALL += " \
- weston \
- weston-init-guest \
- weston-ini-conf-guest \
- wayland-ivi-extension \
- ilm-manager \
- mominavi \
- momiplay \
- momiscreen \
- qtquickcontrols \
- qtquickcontrols2 \
- qtwayland \
- systemd-netif-config \
- ttf-dejavu-sans \
- ttf-dejavu-sans-mono \
- ttf-dejavu-sans-condensed \
- ttf-dejavu-serif \
- ttf-dejavu-serif-condensed \
- ttf-dejavu-mathtexgyre \
- ttf-dejavu-common \
- ca-certificates \
- wireplumber \
- packagegroup-pipewire-base \
- wireplumber-policy-config-agl \
-" \ No newline at end of file
diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb b/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
deleted file mode 100644
index 6a47cfe5..00000000
--- a/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "A minimal container guest image"
-
-require recipes-platform/images/agl-image-boot.inc
-
-IMAGE_LINGUAS = " "
-
-IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
-
-IMAGE_INSTALL:append = " \
- packagegroup-agl-ic-core \
-"
diff --git a/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb b/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
deleted file mode 100644
index c7424f57..00000000
--- a/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "LXC host demo image"
-LICENSE = "MIT"
-
-require lxc-host-image-minimal.bb
-
-CONTAINER_IMAGES ?= "agl-container-cluster:guest-image-cluster-demo \
- agl-container-ivi:guest-image-ivi-demo \
- "
-
-IMAGE_INSTALL += " \
- kernel-modules \
- alsa-utils \
- packagegroup-pipewire \
- pipewire-ic-ipc \
- wireplumber-config-agl \
-"
-
-# packages required for network bridge settings via lxc-net
-IMAGE_INSTALL += " \
- lxc-networking \
- iptables-modules \
- dnsmasq \
- systemd-netif-config \
- kernel-module-xt-addrtype \
- kernel-module-xt-multiport \
-"
-
-# network manager to use
-VIRTUAL-RUNTIME_net_manager = "systemd"
-
-IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles "
diff --git a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb b/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
deleted file mode 100644
index 38fc7b26..00000000
--- a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "A minimal container host image"
-
-require recipes-platform/images/agl-image-boot.inc
-
-IMAGE_INSTALL += " \
- kernel-image \
- lxc \
- ${LXC_CONTAINER_CONFIGS} \
- drm-lease-manager \
-"
-
-CONTAINER_IMAGES ??= ""
-
-LXC_CONTAINER_CONFIGS ?= ""
-
-IMAGE_LINGUAS = " "
-
-NO_RECOMMENDATIONS = "1"
-
-# Handle modification of IMAGE_LINK_NAME done by ULCB builds with Kingfisher support
-MACHINE_SUFFIX = "${@bb.utils.contains('AGL_FEATURES', 'kingfisher', '-kf', '', d)}"
-
-python __anonymous() {
- for c in (d.getVar('CONTAINER_IMAGES') or "").split():
- (mc, image) = c.split(':')
- dependency = 'mc::' + mc + ':' + image + ':do_image_complete'
- d.appendVarFlag('do_rootfs', 'mcdepends', ' ' + dependency)
-
- # Assume there is a X-lxc-config package for guest-image-X
- config = image
- if config.startswith('guest-image-'):
- config = config[len('guest-image-'):]
- d.appendVar('LXC_CONTAINER_CONFIGS', ' ' + 'lxc-config-' + config)
-}
-
-install_container_images() {
- for c in ${CONTAINER_IMAGES}; do
- config=${c%:*}
- image=${c#*:}
- name=${image#guest-image-}
- rm -rf ${IMAGE_ROOTFS}/var/lib/machines/${name}
- install -m 0755 -d ${IMAGE_ROOTFS}/var/lib/machines/${name}
- src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}.tar.bz2"
- bbnote "Installing ${src}"
- tar -C ${IMAGE_ROOTFS}/var/lib/machines/${name} -xf ${src}
- done
-}
-
-#
-# Force rebuild of rootfs on every build to work around mcdepends issue
-#
-# NOTE:
-# This is currently required as bitbake fails to trigger do_rootfs
-# sometimes even when the guest image has in fact rebuilt. This is
-# being investigated with upstream.
-#
-do_rootfs[nostamp] = "1"
-
-ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "
-
-IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
-
diff --git a/meta-agl-lxc/recipes-platform/packagegroups/packagegroup-agl-ic-core.bb b/meta-agl-lxc/recipes-platform/packagegroups/packagegroup-agl-ic-core.bb
deleted file mode 100644
index d54685c8..00000000
--- a/meta-agl-lxc/recipes-platform/packagegroups/packagegroup-agl-ic-core.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "AGL Instrument Cluster Core Packages"
-DESCRIPTION = "This pacage group including AGL Instrument Cluster function core packages such as \
- common library,framework."
-HOMEPAGE = "https://confluence.automotivelinux.org/display/IC"
-
-LICENSE = "Apache-2.0"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-ic-core \
-"
-RDEPENDS:${PN} += "\
- libclusteripc \
- libclusterapi \
- librefop \
-"