diff options
5 files changed, 27 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 = "" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend new file mode 100644 index 00000000..e30136f2 --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend @@ -0,0 +1,4 @@ +# Add a hook to disable depending on cryptodev-module for containers +CRYPTODEV_RDEPENDS = "cryptodev-module" +CRYPTODEV_RDEPENDS_aglcontainerguest = "" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend new file mode 100644 index 00000000..41cdea3b --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}_remove_aglcontainerguest = "kernel-module-gles" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend new file mode 100644 index 00000000..0eae3d3c --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend @@ -0,0 +1,8 @@ +# Enable LXC support +KERNEL_FEATURES += "lxc.scc" + +# Workaround cfg/virtio.scc issue in meta-virtualization for now. +# If it's addition is made not unconditional or the file is made +# available in meta-virtualization as opposed to yocto-kernel-cache, +# this can be revisited. +KERNEL_FEATURES_remove = "cfg/virtio.scc" |