meta-agl-ic-container: updates for scarthgap upgrade

Initial set of fixes to handle upgrade to YP 5.0 / scarthgap.  The
images are still not buildable after these changes due to the DRM
lease changes to Weston needing further work.

Changes:
- Rename gstreamer1.0-plugins-bad bbappend for version bump.
- Update rcar-gen3 kernel module bbappends to be compatible with
  upstream recipe changes.
- Update lxc bbappend to handle addition of lxc-monitord in new
  version.
- Refreshed wireplumber patch to fix QA errors.
- Dropped dlt-daemon logging patch for now, IC EG will need to
  investigate whether it is still required.

Bug-AGL: SPEC-5123

Change-Id: I3c49bee8c53ef5127950643d3f455167e4da30d9
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

8 files changed, 28 insertions, 22 deletions

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
-