aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-lxc/conf
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-06-14 19:38:23 -0400
committerScott Murray <scott.murray@konsulko.com>2021-06-14 19:38:23 -0400
commit473894df92072f2b58839667b7db61dcb7cdef21 (patch)
tree509d4fc3ad9af20d113617274dd51981d8c1fd49 /meta-agl-lxc/conf
parent1f63a80ae9380317f11417819aa8f8656a4e5ef2 (diff)
meta-agl-lxc: add initial rcar3 support
Note that these changes do allow building and booting the lxc-host-image-demo image, and the cluster-demo container does get autostarted, but currently Weston fails to start in the container. Changes: - Add a meta-rcar-gen3 dynamic layer with some bbappends to disable problematic kernel module dependencies when building for the container guest configuration. The ones used are based on the ones in the IC EG container-bsp github repo, but fewer are needed due to the use of linux-dummy, and the changes are done via aglcontainerguest overrides. - Add linux-renesas bbappend that disables the problematic default addition of virtio.scc to KERNEL_FEATURES done in the meta-virtualization layer, which currently is dependent on the file coming from the linux-yocto kernel metadata, which is not the case with linux-renesas. Upstream have been engaged on this being a problem, so this may not be required in the future. - Add lxc.scc to KERNEL_FEATURES in linux-renesas bbappend to leverage the .cfg from meta-virtualization. - Borrow a couple of tweaks from the IC EG container-bsp github repo to disable firmware and disable the serial consoles in the container guest build. Bug-AGL: SPEC-3953 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I30fe6a940c5c44ee2ad71410a97a4495829c0b45
Diffstat (limited to 'meta-agl-lxc/conf')
-rw-r--r--meta-agl-lxc/conf/layer.conf6
-rw-r--r--meta-agl-lxc/conf/multiconfig/agl-container-guest.conf9
2 files changed, 14 insertions, 1 deletions
diff --git a/meta-agl-lxc/conf/layer.conf b/meta-agl-lxc/conf/layer.conf
index 4030d6e9..64db95a2 100644
--- a/meta-agl-lxc/conf/layer.conf
+++ b/meta-agl-lxc/conf/layer.conf
@@ -8,4 +8,10 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
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 = "dunfell"
diff --git a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
index d7b85ee5..1e2e932d 100644
--- a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
+++ b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
@@ -10,7 +10,14 @@ IMAGE_FSTYPES_aglcontainerguest = "container"
IMAGE_LINGUAS_append_aglcontainerguest = " en-us"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+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 = ""