From 25c229ffd140a0d68e54f5928908bfcb7561044c Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Thu, 8 Aug 2024 11:49:35 -0400 Subject: [PATCH 1/4] RDKE-143: add the missing ones --- recipes-graphics/westeros-soc/westeros-soc-drm.bb | 4 ++-- recipes-graphics/westeros/westeros-sink.bbappend | 1 + .../devicesettings/devicesettings-hal-raspberrypi4.bb | 2 +- recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb | 4 ++-- recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes-graphics/westeros-soc/westeros-soc-drm.bb b/recipes-graphics/westeros-soc/westeros-soc-drm.bb index 7cdd689..f35a298 100644 --- a/recipes-graphics/westeros-soc/westeros-soc-drm.bb +++ b/recipes-graphics/westeros-soc/westeros-soc-drm.bb @@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "(hikey-32|dragonboard-410c-32|dragonboard-820c-32|poplar|i DEPENDS = "wayland virtual/egl glib-2.0 libdrm" -PROVIDES = "virtual/westeros-soc westeros-soc" -RPROVIDES_${PN} = "virtual/westeros-soc westeros-soc" +PROVIDES = "virtual/westeros-soc westeros-soc virtual/vendor-westeros-soc" +RPROVIDES_${PN} = "virtual/westeros-soc westeros-soc virtual/vendor-westeros-soc" CFLAGS_append = " -I${STAGING_INCDIR}/libdrm" diff --git a/recipes-graphics/westeros/westeros-sink.bbappend b/recipes-graphics/westeros/westeros-sink.bbappend index 8ce0d19..04a922c 100644 --- a/recipes-graphics/westeros/westeros-sink.bbappend +++ b/recipes-graphics/westeros/westeros-sink.bbappend @@ -1,6 +1,7 @@ S = "${WORKDIR}/git" PROVIDES = "virtual/vendor-westeros-sink" +RPROVIDES_${PN} = "virtual/vendor-westeros-sink" SINK_SOC_PATH = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'v4l2', 'rpi', d)}" diff --git a/recipes-halif/devicesettings/devicesettings-hal-raspberrypi4.bb b/recipes-halif/devicesettings/devicesettings-hal-raspberrypi4.bb index a634772..b780a1b 100644 --- a/recipes-halif/devicesettings/devicesettings-hal-raspberrypi4.bb +++ b/recipes-halif/devicesettings/devicesettings-hal-raspberrypi4.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" PROVIDES = "virtual/devicesettings-hal virtual/vendor-devicesettings-hal" -RPROVIDES_${PN} = "virtual/devicesettings-hal" +RPROVIDES_${PN} = "virtual/devicesettings-hal virtual/vendor-devicesettings-hal" # a HAL is machine specific PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb b/recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb index f1a5230..ca814ea 100644 --- a/recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb +++ b/recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb @@ -8,8 +8,8 @@ SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-hdmicec-raspberrypi4;${CMF_GIT_SRC_URI_SUF S = "${WORKDIR}/git" -PROVIDES = "virtual/hdmicec-hal" -RPROVIDES_${PN} = "virtual/hdmicec-hal" +PROVIDES = "virtual/hdmicec-hal virtual/vendor-hdmicec-hal" +RPROVIDES_${PN} = "virtual/hdmicec-hal virtual/vendor-hdmicec-hal" DEPENDS = "hdmicecheader" diff --git a/recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb b/recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb index 442e2d4..09d31b1 100644 --- a/recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb +++ b/recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb @@ -3,6 +3,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3" PROVIDES = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal" +RPROVIDES_${PN} = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal" # Future: RDK-48312 says IARMMGRS HAL will be split into Power & DeepSleep. # Rename this recipe as Power Manager HAL when this happens and introduce another for DeepSleep. From dabb315b4ddf4873118e8b7c5d25ec8235f4c30a Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Thu, 8 Aug 2024 13:31:28 -0400 Subject: [PATCH 2/4] Use Cmake based HDMICEC HAL --- conf/include/vendor_pkg_versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc index 53e31e1..5781219 100644 --- a/conf/include/vendor_pkg_versions.inc +++ b/conf/include/vendor_pkg_versions.inc @@ -182,7 +182,7 @@ PV_pn-devicesettings-hal-raspberrypi4 = "2.0.0" PR_pn-devicesettings-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-devicesettings-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}" -SRCREV_pn-hdmicec-hal-raspberrypi4 = "1.0.0" +SRCREV_pn-hdmicec-hal-raspberrypi4 = "38a5125e318ba2a057fc980c6bd7d4a5d9b14a8f" PV_pn-hdmicec-hal-raspberrypi4 = "1.0.0" PR_pn-hdmicec-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-hdmicec-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}" From b9332407b2207393b700daee4c1266c29901f278 Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Thu, 8 Aug 2024 15:26:01 -0400 Subject: [PATCH 3/4] RDKVREFPLT-2898: get the cechal qa error fix --- conf/include/vendor_pkg_versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc index 5781219..a98c1e3 100644 --- a/conf/include/vendor_pkg_versions.inc +++ b/conf/include/vendor_pkg_versions.inc @@ -182,7 +182,7 @@ PV_pn-devicesettings-hal-raspberrypi4 = "2.0.0" PR_pn-devicesettings-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-devicesettings-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}" -SRCREV_pn-hdmicec-hal-raspberrypi4 = "38a5125e318ba2a057fc980c6bd7d4a5d9b14a8f" +SRCREV_pn-hdmicec-hal-raspberrypi4 = "355980811077bf805272d9367f770874a2285233" PV_pn-hdmicec-hal-raspberrypi4 = "1.0.0" PR_pn-hdmicec-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-hdmicec-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}" From b7f4e33f4ceb8af36a06bf8f3b282e7766b036d0 Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Thu, 8 Aug 2024 19:35:39 -0400 Subject: [PATCH 4/4] Reverting dabb315b4ddf4873118e8b7c5d25ec8235f4c30a and b9332407b2207393b700daee4c1266c29901f278 --- conf/include/vendor_pkg_versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc index a98c1e3..5781219 100644 --- a/conf/include/vendor_pkg_versions.inc +++ b/conf/include/vendor_pkg_versions.inc @@ -182,7 +182,7 @@ PV_pn-devicesettings-hal-raspberrypi4 = "2.0.0" PR_pn-devicesettings-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-devicesettings-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}" -SRCREV_pn-hdmicec-hal-raspberrypi4 = "355980811077bf805272d9367f770874a2285233" +SRCREV_pn-hdmicec-hal-raspberrypi4 = "38a5125e318ba2a057fc980c6bd7d4a5d9b14a8f" PV_pn-hdmicec-hal-raspberrypi4 = "1.0.0" PR_pn-hdmicec-hal-raspberrypi4 = "r0" PACKAGE_ARCH_pn-hdmicec-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"