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>

5 files changed, 9 insertions, 8 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