diff options
21 files changed, 47 insertions, 40 deletions
diff --git a/meta-agl-drm-lease/conf/layer.conf b/meta-agl-drm-lease/conf/layer.conf index 7614ba9f..7cb075ab 100644 --- a/meta-agl-drm-lease/conf/layer.conf +++ b/meta-agl-drm-lease/conf/layer.conf @@ -24,4 +24,4 @@ BBFILES_DYNAMIC += " \ LAYERVERSION_agl-drm-lease = "1" LAYERDEPENDS_agl-drm-lease = "core" -LAYERSERIES_COMPAT_agl-drm-lease = "kirkstone" +LAYERSERIES_COMPAT_agl-drm-lease = "scarthgap" diff --git a/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa/0001-Workaround-Disable-DRM_AUTH-checks-on-wayland-protocols.patch b/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa/0001-Workaround-Disable-DRM_AUTH-checks-on-wayland-protocols.patch index f6be51e0..a83ca0ee 100644 --- a/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa/0001-Workaround-Disable-DRM_AUTH-checks-on-wayland-protocols.patch +++ b/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa/0001-Workaround-Disable-DRM_AUTH-checks-on-wayland-protocols.patch @@ -1,4 +1,4 @@ -From f583672221b8451d03f739bc96428e97809d021a Mon Sep 17 00:00:00 2001 +From 991eb404c23c328b10894303be00c1036e6d3d3d Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia <dhobsong@igel.co.jp> Date: Tue, 5 Apr 2022 18:09:02 +0900 Subject: [PATCH] Workaround: Disable DRM_AUTH check on wayland protocols @@ -18,25 +18,26 @@ DRM lease and/or whether the import/export can succeed without authentication. For now, just try to authenticate and ignore any failures. --- - src/egl/drivers/dri2/platform_drm.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + src/egl/drivers/dri2/platform_drm.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c -index d0ab172..260a2c6 100644 +index 1a35ae3..0436f16 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c -@@ -508,7 +508,10 @@ dri2_drm_authenticate(_EGLDisplay *disp, uint32_t id) +@@ -405,7 +405,11 @@ dri2_drm_authenticate(_EGLDisplay *disp, uint32_t id) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); -- return drmAuthMagic(dri2_dpy->fd, id); +- return drmAuthMagic(dri2_dpy->fd_render_gpu, id); ++ //return drmAuthMagic(dri2_dpy->fd_render_gpu, id); + /* WORKAROUND: Ignore DRM_AUTH failures. Ideally should only be done for + clienits coming through a DRM lease, but just make it global for now */ -+ drmAuthMagic(dri2_dpy->fd, id); ++ drmAuthMagic(dri2_dpy->fd_render_gpu, id); + return 0; } static void -- -2.17.1 +2.37.3 diff --git a/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_24.%.bbappend index 15e3aeba..15e3aeba 100644 --- a/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_22.%.bbappend +++ b/meta-agl-drm-lease/dynamic-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_24.%.bbappend diff --git a/meta-agl-drm-lease/recipes-graphics/weston/weston_10.0.%.bbappend b/meta-agl-drm-lease/recipes-graphics/weston/weston_13.0.%.bbappend index 0aca4cff..0aca4cff 100644 --- a/meta-agl-drm-lease/recipes-graphics/weston/weston_10.0.%.bbappend +++ b/meta-agl-drm-lease/recipes-graphics/weston/weston_13.0.%.bbappend diff --git a/meta-agl-flutter/conf/layer.conf b/meta-agl-flutter/conf/layer.conf index 725a25b2..e21f9bc6 100644 --- a/meta-agl-flutter/conf/layer.conf +++ b/meta-agl-flutter/conf/layer.conf @@ -12,7 +12,7 @@ BBFILE_PRIORITY_agl-flutter-layer = "61" LAYERVERSION_agl-flutter-layer = "1" LAYERDEPENDS_agl-flutter-layer = "core flutter-layer" LAYERRECOMMENDS_agl-flutter-layer = "flutter-apps-layer" -LAYERSERIES_COMPAT_agl-flutter-layer = "kirkstone" +LAYERSERIES_COMPAT_agl-flutter-layer = "scarthgap" BBFILES_DYNAMIC += " \ flutter-apps-layer:${LAYERDIR}/dynamic-layers/flutter-apps-layer/*/*/*/*.bbappend \ diff --git a/meta-agl-ic-container/conf/layer.conf b/meta-agl-ic-container/conf/layer.conf index ca1bf7a3..47000a76 100644 --- a/meta-agl-ic-container/conf/layer.conf +++ b/meta-agl-ic-container/conf/layer.conf @@ -18,5 +18,5 @@ BBFILES_DYNAMIC += " \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bbappend \ " -LAYERSERIES_COMPAT_aglcontainermc = "kirkstone" +LAYERSERIES_COMPAT_aglcontainermc = "scarthgap" LAYERDEPENDS_aglcontainermc = "aglcore qt5-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend index a9d09a77..d44d489d 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend @@ -2,6 +2,7 @@ inherit guest-kernel-module do_install:aglcontainerguest:append() { # Install shared header file to ${includedir} - install -m 644 ${S}/${MMNGR_DRV_DIR}/include/mmngr_public_cmn.h ${D}/${includedir}/ - install -m 644 ${S}/${MMNGR_DRV_DIR}/include/mmngr_private_cmn.h ${D}/${includedir}/ + install -m 644 ${B}/../include/mmngr_public_cmn.h ${D}/${includedir}/ + install -m 644 ${B}/../include/mmngr_private_cmn.h ${D}/${includedir}/ + install -m 644 ${B}/../include/mmngr_validate.h ${D}/${includedir}/ } diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend index 2323de93..81fe1ea7 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend @@ -2,5 +2,5 @@ inherit guest-kernel-module do_install:aglcontainerguest:append() { # Install shared header files to ${includedir} - install -m 644 ${S}/${MMNGRBUF_DRV_DIR}/include/mmngr_buf_private_cmn.h ${D}/${includedir}/ + install -m 644 ${B}/../include/mmngr_buf_private_cmn.h ${D}/${includedir}/ } diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend index eb478bea..baf8cb39 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend @@ -1,8 +1,8 @@ inherit guest-kernel-module do_install:aglcontainerguest:append() { - # Install shared header files - install -m 644 ${S}/${VSPM_DRV_DIR}/include/vspm_cmn.h ${D}/${includedir}/ - install -m 644 ${S}/${VSPM_DRV_DIR}/include/vsp_drv.h ${D}/${includedir}/ - install -m 644 ${S}/${VSPM_DRV_DIR}/include/fdp_drv.h ${D}/${includedir}/ + # Install shared header filesi + install -m 644 ${B}/../include/vspm_cmn.h ${D}/${includedir}/ + install -m 644 ${B}/../include/vsp_drv.h ${D}/${includedir}/ + install -m 644 ${B}/../include/fdp_drv.h ${D}/${includedir}/ } diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend index 00078b9c..d02d12ed 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend @@ -2,5 +2,5 @@ inherit guest-kernel-module do_install:aglcontainerguest:append() { # Install shared header file - install -m 644 ${S}/${VSPMIF_DRV_DIR}/include/vspm_if.h ${D}/${includedir}/ + install -m 644 ${B}/../include/vspm_if.h ${D}/${includedir}/ } diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend index 204b6902..204b6902 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend diff --git a/meta-agl-ic-container/recipes-container/lxc/lxc_%.bbappend b/meta-agl-ic-container/recipes-container/lxc/lxc_%.bbappend index cbfc6135..7ee8b6cf 100644 --- a/meta-agl-ic-container/recipes-container/lxc/lxc_%.bbappend +++ b/meta-agl-ic-container/recipes-container/lxc/lxc_%.bbappend @@ -16,12 +16,14 @@ do_install:append () { } # Divide lxc autostart from main package. -SYSTEMD_PACKAGES = "${PN}-autostart ${PN}-networking" +SYSTEMD_PACKAGES = "${PN}-autostart ${PN}-monitord ${PN}-networking" SYSTEMD_SERVICE:${PN} = "" SYSTEMD_SERVICE:${PN}-autostart = "lxc.service" SYSTEMD_AUTO_ENABLE:${PN}-autostart = "enable" +SYSTEMD_SERVICE:${PN}-monitord = "lxc-monitord.service" +SYSTEMD_AUTO_ENABLE:${PN}-monitord = "enable" -PACKAGES =+ "${PN}-autostart" +PACKAGES =+ "${PN}-autostart ${PN}-monitord" FILES:${PN}-autostart += " \ ${sysconfdir}/default/lxc \ @@ -30,6 +32,9 @@ FILES:${PN}-autostart += " \ FILES:${PN}-doc += " \ ${datadir}/doc/lxc/examples \ " +FILES:${PN}-monitord += " \ + ${libexexdir}/lxc/lxc-monitord \ +" FILES:${PN}-networking += " \ ${sysconfdir}/dnsmasq.d \ " diff --git a/meta-agl-ic-container/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend b/meta-agl-ic-container/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend index 75402fc6..5a82ce3d 100644 --- a/meta-agl-ic-container/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend +++ b/meta-agl-ic-container/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend @@ -1,8 +1,11 @@ # DLT for Linux container integration FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +# NOTE: +# file://0001-Disable-noisy-log-from-dlt-daemon.patch removed +# until someone can review its status with upstream and rebase +# it if it is still required. SRC_URI:append = " \ - file://0001-Disable-noisy-log-from-dlt-daemon.patch \ file://dlt.conf \ file://dlt-system.conf \ file://dlt_logstorage.conf \ diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch index 0da0bfb6..42991e67 100644 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch +++ b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch @@ -1,4 +1,4 @@ -From a2d324c75057f0ddd66cbe5b5e419fddda213cc2 Mon Sep 17 00:00:00 2001 +From 7c389b72b5a009ca56f90bbc531074b55bdcb5a9 Mon Sep 17 00:00:00 2001 From: Ashok Sidipotu <ashok.sidipotu@collabora.com> Date: Mon, 28 Feb 2022 06:46:19 +0530 Subject: [PATCH] systemd: changes to run wireplumber instances in containers @@ -6,15 +6,15 @@ Subject: [PATCH] systemd: changes to run wireplumber instances in containers - remove the pipewire daemon dependencies so that only wireplumber policy daemon can run in containers. - remove pipewire user + +Upstream-Status: Inappropriate [configuration] --- src/systemd/system/wireplumber@.service.in | 8 +++----- src/systemd/user/wireplumber@.service.in | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) - Inappropriate [configuration] - diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in -index ba8eefe..e4b985b 100644 +index 29e65598..686a93d3 100644 --- a/src/systemd/system/wireplumber@.service.in +++ b/src/systemd/system/wireplumber@.service.in @@ -5,8 +5,7 @@ @@ -27,8 +27,8 @@ index ba8eefe..e4b985b 100644 Conflicts=pipewire-media-session.service [Service] -@@ -19,9 +18,8 @@ SystemCallFilter=@system-service - Type=simple +@@ -19,9 +18,8 @@ Type=simple + AmbientCapabilities=CAP_SYS_NICE ExecStart=@WP_BINARY@ -c %i.conf Restart=on-failure -User=pipewire @@ -40,7 +40,7 @@ index ba8eefe..e4b985b 100644 -WantedBy=pipewire.service +WantedBy=multi-user.target diff --git a/src/systemd/user/wireplumber@.service.in b/src/systemd/user/wireplumber@.service.in -index 9dbceff..7e21194 100644 +index a0b10f7b..8fbd6bd7 100644 --- a/src/systemd/user/wireplumber@.service.in +++ b/src/systemd/user/wireplumber@.service.in @@ -5,8 +5,7 @@ @@ -53,12 +53,9 @@ index 9dbceff..7e21194 100644 Conflicts=pipewire-media-session.service [Service] -@@ -23,4 +22,4 @@ Slice=session.slice +@@ -22,4 +21,4 @@ Slice=session.slice Environment=GIO_USE_VFS=local [Install] -WantedBy=pipewire.service +WantedBy=multi-user.target --- -2.35.1 - diff --git a/meta-agl-jailhouse/conf/layer.conf b/meta-agl-jailhouse/conf/layer.conf index 5dd68b2c..f561a86c 100644 --- a/meta-agl-jailhouse/conf/layer.conf +++ b/meta-agl-jailhouse/conf/layer.conf @@ -11,7 +11,7 @@ BBFILE_PRIORITY_agl-jailhouse = "61" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_agl-jailhouse = "1" -LAYERSERIES_COMPAT_agl-jailhouse = "kirkstone" +LAYERSERIES_COMPAT_agl-jailhouse = "scarthgap" # This is only needed for Raspberry Pi # TODO: can this be expressed dynamically? diff --git a/meta-agl-test/conf/layer.conf b/meta-agl-test/conf/layer.conf index f8dba7cb..a1c18205 100644 --- a/meta-agl-test/conf/layer.conf +++ b/meta-agl-test/conf/layer.conf @@ -11,4 +11,4 @@ BBFILE_PATTERN_agl-test = "^${LAYERDIR}/" # cause compatibility issues with other layers LAYERVERSION_agl-test = "1" -LAYERSERIES_COMPAT_agl-test = "kirkstone" +LAYERSERIES_COMPAT_agl-test = "scarthgap" diff --git a/meta-agl-wireless-monitor/conf/layer.conf b/meta-agl-wireless-monitor/conf/layer.conf index 9e4f91b8..e21fa987 100644 --- a/meta-agl-wireless-monitor/conf/layer.conf +++ b/meta-agl-wireless-monitor/conf/layer.conf @@ -12,4 +12,4 @@ BBFILE_PRIORITY_agl-drm-lease = "100" # cause compatibility issues with other layers LAYERVERSION_agl-wireless-monitor = "1" -LAYERSERIES_COMPAT_agl-wireless-monitor = "kirkstone" +LAYERSERIES_COMPAT_agl-wireless-monitor = "scarthgap" diff --git a/meta-egvirt/conf/layer.conf b/meta-egvirt/conf/layer.conf index a8dcafd8..1aea8992 100644 --- a/meta-egvirt/conf/layer.conf +++ b/meta-egvirt/conf/layer.conf @@ -11,6 +11,6 @@ BBFILE_PRIORITY_egvirt = "61" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_egvirt = "1" -LAYERSERIES_COMPAT_egvirt = "kirkstone" +LAYERSERIES_COMPAT_egvirt = "scarthgap" LAYERDEPENDS_egvirt = "core clang-layer filesystems-layer" diff --git a/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf index 10c86f64..e75e0fce 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf +++ b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf @@ -12,5 +12,5 @@ BBFILE_PRIORITY_agl-basesystem = "60" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_agl-basesystem = "1" -LAYERSERIES_COMPAT_agl-basesystem = "kirkstone" +LAYERSERIES_COMPAT_agl-basesystem = "scarthgap" LAYERDEPENDS_agl-basesystem = "core" diff --git a/meta-offline-voice-agent/conf/layer.conf b/meta-offline-voice-agent/conf/layer.conf index e5dca632..83ed05d4 100644 --- a/meta-offline-voice-agent/conf/layer.conf +++ b/meta-offline-voice-agent/conf/layer.conf @@ -10,7 +10,7 @@ BBFILE_PATTERN_meta-offline-voice-agent = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-offline-voice-agent = "65" LAYERDEPENDS_meta-offline-voice-agent = "core" -LAYERSERIES_COMPAT_meta-offline-voice-agent = "dunfell kirkstone" +LAYERSERIES_COMPAT_meta-offline-voice-agent = "scarthgap" BBFILES_DYNAMIC += " \ agldemo:${LAYERDIR}/dynamic-layers/meta-agl-demo/*/*/*.bb \ diff --git a/meta-uhmi/meta-rvgpu/conf/layer.conf b/meta-uhmi/meta-rvgpu/conf/layer.conf index b33aa324..5451560f 100644 --- a/meta-uhmi/meta-rvgpu/conf/layer.conf +++ b/meta-uhmi/meta-rvgpu/conf/layer.conf @@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \ raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \ " -LAYERSERIES_COMPAT_meta-rvgpu= "kirkstone" +LAYERSERIES_COMPAT_meta-rvgpu= "scarthgap" |