Merge pull request #85 from rdkcentral/develop

Develop to main
rdkcentral · Sep 12, 2024 · f816957 · f816957
2 parents b0b087b + 3cb28a6
commit f816957
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc
@@ -174,6 +174,11 @@ PR_pn-westeros-sink = "${WESTEROS_REVISION}"
 PACKAGE_ARCH_pn-westeros-sink = "${VENDOR_LAYER_EXTENSION}"
 SRCREV_pn-westeros-sink = "${WESTEROS_SRCREV}"
 
+PV_pn-wayland-default-egl = "1.18.0"
+PR_pn-wayland-default-egl = "r0"
+PACKAGE_ARCH_pn-wayland-default-egl = "${VENDOR_LAYER_EXTENSION}"
+SRCREV_pn-wayland-default-egl = "1.18.0"
+
 # RDKV HAL component versions
 
 # RDKV HAL component versions of raspberrypi4
@@ -192,7 +197,7 @@ PV_pn-iarmmgrs-hal-raspberrypi4 = "2.0.1"
 PR_pn-iarmmgrs-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-iarmmgrs-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
 
-SRCREV_pn-mfrlibs-hal-raspberrypi4 = "1.0.1"
+SRCREV_pn-mfrlibs-hal-raspberrypi4 = "1.0.2"
 PV_pn-mfrlibs-hal-raspberrypi4 = "1.0.0"
 PR_pn-mfrlibs-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-mfrlibs-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"

diff --git a/conf/template/bblayers.conf.sample b/conf/template/bblayers.conf.sample
@@ -14,19 +14,21 @@ BBLAYERS ?= " \
         ${MANIFEST_PATH_OPENEMBEDDED}/meta-python \
         ${MANIFEST_PATH_OPENEMBEDDED}/meta-multimedia \
         ${MANIFEST_PATH_OPENEMBEDDED}/meta-networking \
+        ${MANIFEST_PATH_STACK_LAYERING_SUPPORT} \
         ${MANIFEST_PATH_IMAGE_SUPPORT} \
         "
+
+# Common layers
+BBLAYERS =+ "${@'${MANIFEST_PATH_OSS_VENDOR}' if os.path.isfile('${MANIFEST_PATH_OSS_VENDOR}/conf/layer.conf') else ''}"
+BBLAYERS =+ "${@'${MANIFEST_PATH_RDK_HALIF_HEADERS}' if os.path.isfile('${MANIFEST_PATH_RDK_HALIF_HEADERS}/conf/layer.conf') else ''}"
+BBLAYERS =+ "${@'${MANIFEST_PATH_CONFIG_COMMON}' if os.path.isfile('${MANIFEST_PATH_CONFIG_COMMON}/conf/layer.conf') else ''}"
+BBLAYERS =+ "${@'${MANIFEST_PATH_CONFIGS_PROFILE}' if os.path.isfile('${MANIFEST_PATH_CONFIGS_PROFILE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_PRODUCT_LAYER}' if os.path.isfile('${MANIFEST_PATH_PRODUCT_LAYER}/conf/layer.conf') else ''}"
-#BBLAYERS =+ "${@'${MANIFEST_PATH_MW_RELEASE}' if os.path.isfile('${MANIFEST_PATH_MW_RELEASE}/conf/layer.conf') else ''}"
-#BBLAYERS =+ "${@'${MANIFEST_PATH_VTS}' if os.path.isfile('${MANIFEST_PATH_VTS}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_OSS_RELEASE}' if os.path.isfile('${MANIFEST_PATH_OSS_RELEASE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_COMMON_OSS_REFERENCE}' if os.path.isfile('${MANIFEST_PATH_COMMON_OSS_REFERENCE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_BSP}' if os.path.isfile('${MANIFEST_PATH_BSP}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_PLATFORM}' if os.path.isfile('${MANIFEST_PATH_PLATFORM}/conf/layer.conf') else ''}"
-#BBLAYERS =+ "${@'${MANIFEST_PATH_OEM_OVERLAY_SOC}' if os.path.isfile('${MANIFEST_PATH_OEM_OVERLAY_SOC}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_OSS_VENDOR}' if os.path.isfile('${MANIFEST_PATH_OSS_VENDOR}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_RDK_HALIF_HEADERS}' if os.path.isfile('${MANIFEST_PATH_RDK_HALIF_HEADERS}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_CONFIG_COMMON}' if os.path.isfile('${MANIFEST_PATH_CONFIG_COMMON}/conf/layer.conf') else ''}"
-#BBLAYERS =+ "${@'${MANIFEST_PATH_CONFIGS_REGION}' if os.path.isfile('${MANIFEST_PATH_CONFIGS_REGION}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_CONFIGS_PROFILE}' if os.path.isfile('${MANIFEST_PATH_CONFIGS_PROFILE}/conf/layer.conf') else ''}"
 
+# Future reserved
+#BBLAYERS =+ "${@'${MANIFEST_PATH_OEM_OVERLAY_SOC}' if os.path.isfile('${MANIFEST_PATH_OEM_OVERLAY_SOC}/conf/layer.conf') else ''}"
+#BBLAYERS =+ "${@'${MANIFEST_PATH_VTS}' if os.path.isfile('${MANIFEST_PATH_VTS}/conf/layer.conf') else ''}"
diff --git a/recipes-core/images/vendor-test-image.bb b/recipes-core/images/vendor-test-image.bb
@@ -1,7 +1,8 @@
 SUMMARY = "A small image just capable of allowing a device to boot."
 
 IMAGE_INSTALL = " \
-                 packagegroup-core-boot ${CORE_IMAGE_EXTRA_INSTALL} \
+                 packagegroup-core-boot \
+                 ${CORE_IMAGE_EXTRA_INSTALL} \
                  packagegroup-vendor-layer \
                 "
 
@@ -13,5 +14,3 @@ inherit core-image
 
 IMAGE_ROOTFS_SIZE ?= "8192"
 IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
-
-inherit custom-rootfs-configuration
diff --git a/recipes-core/packagegroups/packagegroup-vendor-layer.bb b/recipes-core/packagegroups/packagegroup-vendor-layer.bb
@@ -8,7 +8,7 @@ inherit packagegroup
 
 DEPENDS = " virtual/kernel make-mod-scripts"
 
-PV = "1.2.4"
+PV = "1.2.5"
 PR = "r0"
 
 RDEPENDS_${PN} = " \
@@ -48,4 +48,5 @@ RDEPENDS_${PN}:append:rdkv-oss = " \
         westeros \
         westeros-simplebuffer \
         westeros-simpleshell \
+        wayland-default-egl \
         "