From e4f3c653d537f1771592e0ce1cb3f8fc24468c87 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Wed, 29 Jul 2026 16:51:32 +0000
Subject: [PATCH 01/15] Demo changes for RDKOSS-1095

---
 conf/machine/include/middleware.inc | 4 +++-
 conf/machine/include/oss_mw.inc     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index fe952c53..56f045f6 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -8,7 +8,9 @@ PACKAGE_EXTRA_ARCHS:append = " ${MIDDLEWARE_ARCH}"
 RELEASE_NUM = "8.6.3.0"
 
 MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
+#MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
+MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
+CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/tarball/cve/debug/xione-uk-middleware.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
 
 IPK_FEED_URIS += " \ 
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 72769ec8..62dcb11c 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -3,5 +3,7 @@ MW_OSS = "${@get_oss_arch(d)}${MW_EXTENSION}"
 PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
+#MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
+MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/tarball/cve/debug/rdk-arm7ve-oss-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "

From b986767a0f76a5d2a3159ef3d4a363129173e82c Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Thu, 30 Jul 2026 10:06:15 +0000
Subject: [PATCH 02/15] Including dynamic_sha

---
 conf/machine/include/middleware.inc | 1 +
 conf/machine/include/oss_mw.inc     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 56f045f6..77d858e6 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -16,3 +16,4 @@ IPK_FEED_URIS += " \
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
 
 include ${@'oss_mw.inc' if 'STACK_LAYER_OSS_SUPPORT' in d.getVar('DISTRO_FEATURES').split() else ''}
+include conf/dynamic_sha.inc
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 62dcb11c..786eaa51 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -7,3 +7,5 @@ MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
 CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/tarball/cve/debug/rdk-arm7ve-oss-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
+
+include conf/dynamic_sha.inc

From 53307cda55e8af5f332eeadb4b0bf51d0d3c623c Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Sun, 9 Aug 2026 10:34:02 +0000
Subject: [PATCH 03/15] adding generic variables

---
 conf/machine/include/middleware.inc | 5 ++---
 conf/machine/include/oss_mw.inc     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 77d858e6..e57d2aa6 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -8,9 +8,8 @@ PACKAGE_EXTRA_ARCHS:append = " ${MIDDLEWARE_ARCH}"
 RELEASE_NUM = "8.6.3.0"
 
 MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-#MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
-MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/tarball/cve/debug/xione-uk-middleware.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
+MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
+CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MIDDLEWARE_ARCH}.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
 
 IPK_FEED_URIS += " \ 
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 786eaa51..5a331350 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -3,9 +3,8 @@ MW_OSS = "${@get_oss_arch(d)}${MW_EXTENSION}"
 PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-#MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/middleware-dbg/RDKOSS-974-test1/${RDK_MW_ARCH}/tarball/cve/debug/rdk-arm7ve-oss-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
+MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
 include conf/dynamic_sha.inc

From 5349c2899f2fef7c3a0489d9f3c4501d7eef18a5 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 11 Aug 2026 09:54:45 +0000
Subject: [PATCH 04/15] Checking path

---
 conf/machine/include/oss_mw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 5a331350..550d75f2 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -4,7 +4,7 @@ PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
 include conf/dynamic_sha.inc

From d33bc424345c864d3bd2cef4333739c9b5f41ae5 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 11 Aug 2026 15:38:18 +0000
Subject: [PATCH 05/15] CVEpath-2

---
 conf/machine/include/oss_mw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 550d75f2..5a331350 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -4,7 +4,7 @@ PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
 include conf/dynamic_sha.inc

From fe6c320d642b9eac44f11ad2ab38becc6cd0903b Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Wed, 12 Aug 2026 21:41:15 +0000
Subject: [PATCH 06/15] adding CVE_LAYER_COMMON_PATH_MIDDLEWARE

---
 conf/machine/include/middleware.inc | 3 ++-
 conf/machine/include/oss_mw.inc     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index e57d2aa6..03f35979 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -8,8 +8,9 @@ PACKAGE_EXTRA_ARCHS:append = " ${MIDDLEWARE_ARCH}"
 RELEASE_NUM = "8.6.3.0"
 
 MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
+CVE_LAYER_COMMON_PATH_MIDDLEWARE ?= "${MW_IPK_PATH}"
 MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MIDDLEWARE_ARCH}.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
+CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MIDDLEWARE_ARCH}.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
 
 IPK_FEED_URIS += " \ 
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 5a331350..602f0363 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -3,8 +3,9 @@ MW_OSS = "${@get_oss_arch(d)}${MW_EXTENSION}"
 PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
+CVE_LAYER_COMMON_PATH_MIDDLEWARE ?= "${MW_OSS_IPK_PATH}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
 include conf/dynamic_sha.inc

From e466c0f4b0563ee7d709289a07ff5c97e3bcacd6 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Thu, 13 Aug 2026 19:31:58 +0000
Subject: [PATCH 07/15] MW_OSS_CVE change

---
 conf/machine/include/oss_mw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 602f0363..ab8ef879 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -5,7 +5,7 @@ OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
 CVE_LAYER_COMMON_PATH_MIDDLEWARE ?= "${MW_OSS_IPK_PATH}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}-middleware.tgz;sha256sum=${MW_OSS_SHA256SUM}"
+CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
 include conf/dynamic_sha.inc

From a3b03e5941a4df0b601d28ef7dae2b0704eb3899 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Thu, 10 Sep 2026 11:01:40 +0000
Subject: [PATCH 08/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv2

---
 conf/machine/include/middleware.inc | 24 +++++++++++++++++++++---
 conf/machine/include/oss_mw.inc     | 23 ++++++++++++++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 03f35979..83b6b9a5 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -8,12 +8,30 @@ PACKAGE_EXTRA_ARCHS:append = " ${MIDDLEWARE_ARCH}"
 RELEASE_NUM = "8.6.3.0"
 
 MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-CVE_LAYER_COMMON_PATH_MIDDLEWARE ?= "${MW_IPK_PATH}"
 MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MIDDLEWARE_ARCH}.tgz;sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}"
 
 IPK_FEED_URIS += " \ 
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
 
 include ${@'oss_mw.inc' if 'STACK_LAYER_OSS_SUPPORT' in d.getVar('DISTRO_FEATURES').split() else ''}
-include conf/dynamic_sha.inc
+
+#The following section will be only enabled if CVE_CHECK is set
+
+# Check whether CVE-check is globally inherited
+CVE_CHECK_ENABLED = "${@bb.utils.contains('INHERIT', 'cve-check', '1', '0', d)}"
+
+# Conditionally include CVE-specific configuration
+CVE_CONF_INCLUDE = "${@bb.utils.contains('CVE_CHECK_ENABLED', '1', 'conf/dynamic_sha.inc', '', d)}"
+include ${CVE_CONF_INCLUDE}
+
+# CVE configuration section, equivalent to: if (CVE_CHECK_ENABLED)
+python __anonymous() {
+    if d.getVar("CVE_CHECK_ENABLED") == "1":
+        if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
+            d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
+
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
+
+}
+
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index ab8ef879..a20a80b9 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -3,9 +3,26 @@ MW_OSS = "${@get_oss_arch(d)}${MW_EXTENSION}"
 PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
 OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
-CVE_LAYER_COMMON_PATH_MIDDLEWARE ?= "${MW_OSS_IPK_PATH}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
-CVE_LAYER_FEED_PATH += " ${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/debug/${MW_OSS}.tgz;sha256sum=${MW_OSS_SHA256SUM}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
 
-include conf/dynamic_sha.inc
+
+#The following section will be only enabled if CVE_CHECK is set
+
+# Check whether CVE-check is globally inherited
+CVE_CHECK_ENABLED = "${@bb.utils.contains('INHERIT', 'cve-check', '1', '0', d)}"
+
+# Conditionally include CVE-specific configuration needed for SHA
+CVE_CONF_INCLUDE = "${@bb.utils.contains('CVE_CHECK_ENABLED', '1', 'conf/dynamic_sha.inc', '', d)}"
+include ${CVE_CONF_INCLUDE}
+
+# CVE configuration section, equivalent to: if (CVE_CHECK_ENABLED)
+python __anonymous() {
+    if d.getVar("CVE_CHECK_ENABLED") == "1":
+        if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
+            d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
+
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
+
+}

From b25b76d1ea85ecdf8d4d1c5aef6ee340b0996d2e Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Fri, 11 Sep 2026 16:46:43 +0000
Subject: [PATCH 09/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv2

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 83b6b9a5..072292f4 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index a20a80b9..39aeb286 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From ec6f4873742bf007f21a83d6674bad7425584b05 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Sun, 13 Sep 2026 21:21:08 +0000
Subject: [PATCH 10/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv3

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 072292f4..97024119 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/xione-uk-middleware.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 39aeb286..2937070d 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/rdk-arm7ve-oss-middleware.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From 3bab94eed041c00212bc925492c4965cbf2e9219 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 15 Sep 2026 11:45:52 +0000
Subject: [PATCH 11/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv4

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 97024119..01836d2a 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/xione-uk-middleware.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/{MIDDLEWARE_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 2937070d..96772fda 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/rdk-arm7ve-oss-middleware.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/{OSS_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From 5c59a6a86e49db64d899c7f99f3ad843bcaadbe3 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 15 Sep 2026 13:36:27 +0000
Subject: [PATCH 12/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv5

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 01836d2a..868c78aa 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/{MIDDLEWARE_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/rdkstb-armv7ve-middleware.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 96772fda..a08a577c 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/{OSS_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/rdk-arm7ve-oss-middleware.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From 680ef67edbfec39a55b061feb0ae7a126c3ad123 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 22 Sep 2026 11:17:12 +0000
Subject: [PATCH 13/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv6

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 868c78aa..83b6b9a5 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/rdkstb-armv7ve-middleware.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index a08a577c..a20a80b9 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/rdk-arm7ve-oss-middleware.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From b350bb7beaf7f0c9af2329a8a3352ba1bc8c1658 Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 29 Sep 2026 11:06:50 +0000
Subject: [PATCH 14/15] TEST

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 83b6b9a5..072292f4 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index a20a80b9..39aeb286 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }

From 04b63f770b23e25ab8029540067ed97c4c1b2dfb Mon Sep 17 00:00:00 2001
From: jthoma442 <jomo_thomas@comcast.com>
Date: Tue, 29 Sep 2026 11:09:21 +0000
Subject: [PATCH 15/15] RDKEMW-23527 : Inherit extract-sha-cve bbclass for CVE
 support - Addition of CVE middleware pathsv7

---
 conf/machine/include/middleware.inc | 2 +-
 conf/machine/include/oss_mw.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index 072292f4..83b6b9a5 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -30,7 +30,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
 
 }
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 39aeb286..a20a80b9 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -22,7 +22,7 @@ python __anonymous() {
         if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
             d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
 
-        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/xione-uk/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
         d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
 
 }