From 7a2aad5b7ed13d07c5e0d25a6e4329494ba0075e Mon Sep 17 00:00:00 2001
From: Arun P Madhavan <arun_madhavan@comcast.com>
Date: Sat, 13 Jul 2024 17:37:49 +0000
Subject: [PATCH 1/5] RDKE-122: Add vendor specific Thunder ENV data

---
 recipes-soc/sysint-soc/sysint-soc.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-soc/sysint-soc/sysint-soc.bb b/recipes-soc/sysint-soc/sysint-soc.bb
index 41c013c..cb6c405 100644
--- a/recipes-soc/sysint-soc/sysint-soc.bb
+++ b/recipes-soc/sysint-soc/sysint-soc.bb
@@ -17,6 +17,9 @@ do_install() {
         install -m 0644 ${S}/dropbear/sshbanner.txt ${D}${sysconfdir}
         # Provide the OEM/SoC device.properties
         install -m 0644 ${S}/etc/device-vendor.properties ${D}${sysconfdir}
+        # RDKE-122: add wpeframework vendor env
+        install -d ${D}${sysconfdir}/wpeframework
+        install -m 0644 ${S}/WPEFramework.env ${D}${sysconfdir}/wpeframework/WPEFramework.env
 }
  
 FILES_${PN} += "${systemd_unitdir}/system/dropbear.service.d/00-dropbear.conf"

From 92b458ed3bca133f4841f2e643dccaceadd9163a Mon Sep 17 00:00:00 2001
From: Arun P Madhavan <arun_madhavan@comcast.com>
Date: Tue, 16 Jul 2024 01:39:27 +0000
Subject: [PATCH 2/5] RDKE-122: change to install wpeframework ENV as drop-in

---
 recipes-soc/sysint-soc/sysint-soc.bb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/recipes-soc/sysint-soc/sysint-soc.bb b/recipes-soc/sysint-soc/sysint-soc.bb
index cb6c405..2267433 100644
--- a/recipes-soc/sysint-soc/sysint-soc.bb
+++ b/recipes-soc/sysint-soc/sysint-soc.bb
@@ -7,20 +7,22 @@ SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFF
 S = "${WORKDIR}/git"
 
 do_compile[noexec] = "1"
- 
+
 do_install() {
-        # RDKE-115: Dropbear drop-in conf for RPi
         install -d ${D}${systemd_unitdir}/system
+        # RDKE-122: WPEFramework drop-in
+        install -D -m 0644 ${S}/systemd_units/00-wpeframework-vendor.conf ${D}${systemd_unitdir}/system/wpeframework.service.d/00-wpeframework-vendor.conf
+
+        # RDKE-115: Dropbear drop-in conf for RPi
         install -D -m 0644 ${S}/systemd_units/00-dropbear-vendor.conf ${D}${systemd_unitdir}/system/dropbear.service.d/00-dropbear.conf
+
         # Dropbear SSH banner
         install -d ${D}${sysconfdir}
         install -m 0644 ${S}/dropbear/sshbanner.txt ${D}${sysconfdir}
+
         # Provide the OEM/SoC device.properties
         install -m 0644 ${S}/etc/device-vendor.properties ${D}${sysconfdir}
-        # RDKE-122: add wpeframework vendor env
-        install -d ${D}${sysconfdir}/wpeframework
-        install -m 0644 ${S}/WPEFramework.env ${D}${sysconfdir}/wpeframework/WPEFramework.env
 }
- 
-FILES_${PN} += "${systemd_unitdir}/system/dropbear.service.d/00-dropbear.conf"
+
+FILES_${PN} += "${systemd_unitdir}/system/*"
 FILES_${PN} += "${sysconfdir}/*"

From 3dbf02bd24469b25c394a6056977c9955b22fe70 Mon Sep 17 00:00:00 2001
From: Arun P Madhavan <arun_madhavan@comcast.com>
Date: Tue, 16 Jul 2024 01:40:15 +0000
Subject: [PATCH 3/5] RDKE-122: test commit to verify the middleware

---
 recipes-soc/sysint-soc/sysint-soc.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-soc/sysint-soc/sysint-soc.bb b/recipes-soc/sysint-soc/sysint-soc.bb
index 2267433..eec8de0 100644
--- a/recipes-soc/sysint-soc/sysint-soc.bb
+++ b/recipes-soc/sysint-soc/sysint-soc.bb
@@ -3,7 +3,10 @@ SECTION = "console/utils"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
  
-SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+#SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;protocol=${CMF_GIT_PROTOCOL};branch=4-vendor-specific-thunder-environment"
+SRCREV = "b57770ef4a6c4b0d8ba7098e1788ac7504d05c7c"
+
 S = "${WORKDIR}/git"
 
 do_compile[noexec] = "1"

From e58c34520c19d39746e8f48423146ddcff9dc085 Mon Sep 17 00:00:00 2001
From: Arun P Madhavan <arun_madhavan@comcast.com>
Date: Tue, 16 Jul 2024 02:09:04 +0000
Subject: [PATCH 4/5] RDKE-122: fix the logical build error

---
 conf/include/vendor_pkg_versions.inc | 2 +-
 recipes-soc/sysint-soc/sysint-soc.bb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc
index aae5bd2..03e0222 100644
--- a/conf/include/vendor_pkg_versions.inc
+++ b/conf/include/vendor_pkg_versions.inc
@@ -187,7 +187,7 @@ PV_pn-mfrlibs-hal-raspberrypi4 = "1.0.0"
 PR_pn-mfrlibs-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-mfrlibs-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
 
-SRCREV_pn-sysint-soc = "1.0.0"
+SRCREV_pn-sysint-soc = "b57770ef4a6c4b0d8ba7098e1788ac7504d05c7c"
 PV_pn-sysint-soc = "1.0.0"
 PR_pn-sysint-soc = "r0"
 PACKAGE_ARCH_pn-sysint-soc = "${VENDOR_LAYER_EXTENSION}"
diff --git a/recipes-soc/sysint-soc/sysint-soc.bb b/recipes-soc/sysint-soc/sysint-soc.bb
index eec8de0..e430266 100644
--- a/recipes-soc/sysint-soc/sysint-soc.bb
+++ b/recipes-soc/sysint-soc/sysint-soc.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
  
 #SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
 SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;protocol=${CMF_GIT_PROTOCOL};branch=4-vendor-specific-thunder-environment"
-SRCREV = "b57770ef4a6c4b0d8ba7098e1788ac7504d05c7c"
 
 S = "${WORKDIR}/git"
 

From 568b873e9ed9fa0d80503e86cafb2c5661f19a08 Mon Sep 17 00:00:00 2001
From: Arun P Madhavan <arun_madhavan@comcast.com>
Date: Tue, 16 Jul 2024 15:44:01 +0000
Subject: [PATCH 5/5] RDKE-122: use latest sysint-soc

---
 conf/include/vendor_pkg_versions.inc | 2 +-
 recipes-soc/sysint-soc/sysint-soc.bb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/include/vendor_pkg_versions.inc b/conf/include/vendor_pkg_versions.inc
index 03e0222..6ccfe9c 100644
--- a/conf/include/vendor_pkg_versions.inc
+++ b/conf/include/vendor_pkg_versions.inc
@@ -187,7 +187,7 @@ PV_pn-mfrlibs-hal-raspberrypi4 = "1.0.0"
 PR_pn-mfrlibs-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-mfrlibs-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
 
-SRCREV_pn-sysint-soc = "b57770ef4a6c4b0d8ba7098e1788ac7504d05c7c"
+SRCREV_pn-sysint-soc = "1.0.1"
 PV_pn-sysint-soc = "1.0.0"
 PR_pn-sysint-soc = "r0"
 PACKAGE_ARCH_pn-sysint-soc = "${VENDOR_LAYER_EXTENSION}"
diff --git a/recipes-soc/sysint-soc/sysint-soc.bb b/recipes-soc/sysint-soc/sysint-soc.bb
index e430266..c7cad2b 100644
--- a/recipes-soc/sysint-soc/sysint-soc.bb
+++ b/recipes-soc/sysint-soc/sysint-soc.bb
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
  
-#SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
-SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;protocol=${CMF_GIT_PROTOCOL};branch=4-vendor-specific-thunder-environment"
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-sysint-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
 
 S = "${WORKDIR}/git"