From df563b166fe5d72e6251fba3c52b60f26ab9b69f Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Tue, 17 Mar 2026 10:49:45 -0400 Subject: [PATCH 1/5] RDKMVE-1814: test app manifest and cert installation support --- recipes-images/factory-app-manifest.json | 24 ++++++++++++++++++++++++ recipes-images/rdk-fullstack-image.bb | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 recipes-images/factory-app-manifest.json diff --git a/recipes-images/factory-app-manifest.json b/recipes-images/factory-app-manifest.json new file mode 100644 index 0000000..c0ea536 --- /dev/null +++ b/recipes-images/factory-app-manifest.json @@ -0,0 +1,24 @@ +[ + { + "packagename": "com.rdkcentral.base", + "srcuri": "file://com.rdkcentral.base+0.1.0.bolt", + "sha256sum": "d2386dd012e422e737ed2cc66201726bb9e680bc753ed29c46547d3fa0225c1b", + "installpath":"/etc/rdk/factoryapps" + }, + { + "packagename": "com.rdkcentral.wpe-rdk", + "srcuri": "file://com.rdkcentral.wpe-rdk+0.1.0.bolt", + "sha256sum": "8016d174a029eaa9549a64aa888e3189e8219ad62671222ca7460c1ae150c392" + }, + { + "packagename": "com.rdkcentral.refui", + "srcuri": "file://com.rdkcentral.refui+0.0.4.bolt", + "sha256sum": "f94c9f7bdb30d5df368623aa87543e143a68e70043bf29128f5913d5bbb367fd" + }, + { + "packagename": "com.rdkcentral.ralf.crt", + "srcuri": "file://com.rdkcentral.ralf.crt", + "sha256sum": "a71aa6cda766093120a6fb5b855debdddb71ae2ab537f116491994d8fb51429e", + "installpath":"/etc/rdk/certs" + } +] diff --git a/recipes-images/rdk-fullstack-image.bb b/recipes-images/rdk-fullstack-image.bb index 5cbc787..71c900b 100644 --- a/recipes-images/rdk-fullstack-image.bb +++ b/recipes-images/rdk-fullstack-image.bb @@ -11,10 +11,10 @@ IMAGE_INSTALL = " \ inherit core-image custom-rootfs-creation extrausers -EXTRA_USERS_PARAMS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'amazon_non_root_support', '''\ - groupadd -g 1001 amazon;\ - useradd -u 1001 -g amazon -M -r -s /bin/sh amazon;\ -''', '', d)}" +# TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609 +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +FACTORY_APPS_JSON_FILE = "file://factory-app-manifest.json" IMAGE_ROOTFS_SIZE ?= "8192" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" From 3fd7747a26ca88ee2e2a1c176e7cf1bb406daca6 Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Tue, 17 Mar 2026 10:53:14 -0400 Subject: [PATCH 2/5] RDKMVE-1814: weak link the app manifest file --- recipes-images/rdk-fullstack-image.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-images/rdk-fullstack-image.bb b/recipes-images/rdk-fullstack-image.bb index 71c900b..6f923aa 100644 --- a/recipes-images/rdk-fullstack-image.bb +++ b/recipes-images/rdk-fullstack-image.bb @@ -13,8 +13,7 @@ inherit core-image custom-rootfs-creation extrausers # TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609 FILESEXTRAPATHS:prepend := "${THISDIR}:" - -FACTORY_APPS_JSON_FILE = "file://factory-app-manifest.json" +FACTORY_APPS_JSON_FILE ?= "file://factory-app-manifest.json" IMAGE_ROOTFS_SIZE ?= "8192" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" From 80eba9438e9e0020426aeb3c87858a2751d6c38d Mon Sep 17 00:00:00 2001 From: Arun P Madhavan <54109113+arun-madhavan-013@users.noreply.github.com> Date: Tue, 17 Mar 2026 13:35:53 -0400 Subject: [PATCH 3/5] RDKMVE-1814: build verification change - add sample manifest --- conf/layer.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/layer.conf b/conf/layer.conf index fefac3b..0595ae3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -19,3 +19,6 @@ IMAGE_CLASSES:append = " rdkv-community-configs" # TODO: temporary; remove when RDKVREFPLT-5105 is resolved. LOCALCONF_VERSION = "1" + +# TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609 +FACTORY_APPS_JSON_FILE ?= "${LAYERDIR}/factory-app-manifest.json" From 2d7b618a29855f2a4547225e861c849786672ae9 Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Tue, 17 Mar 2026 13:40:16 -0400 Subject: [PATCH 4/5] RDKMVE-1814: add sample factory app manifest --- factory-app-manifest.json | 27 +++++++++++++++++++++++++++ recipes-images/rdk-fullstack-image.bb | 4 ---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 factory-app-manifest.json diff --git a/factory-app-manifest.json b/factory-app-manifest.json new file mode 100644 index 0000000..1f3881c --- /dev/null +++ b/factory-app-manifest.json @@ -0,0 +1,27 @@ +[ + { + "packagename": "com.rdkcentral.base", + "srcuri": "file://com.rdkcentral.base+0.1.0.bolt", + "sha256sum": "d2386dd012e422e737ed2cc66201726bb9e680bc753ed29c46547d3fa0225c1b", + "installpath": "/etc/rdk/factoryapps" + }, + { + "packagename": "com.rdkcentral.wpe-rdk", + "srcuri": "file://com.rdkcentral.wpe-rdk+0.1.0.bolt", + "sha256sum": "8016d174a029eaa9549a64aa888e3189e8219ad62671222ca7460c1ae150c392", + "installpath": "/etc/rdk/factoryapps" + }, + { + "packagename": "com.rdkcentral.refui", + "srcuri": "file://com.rdkcentral.refui+0.0.4.bolt", + "sha256sum": "f94c9f7bdb30d5df368623aa87543e143a68e70043bf29128f5913d5bbb367fd", + "installpath": "/etc/rdk/factoryapps" + }, + { + "packagename": "com.rdkcentral.ralf.crt", + "srcuri": "file://com.rdkcentral.ralf.crt", + "sha256sum": "a71aa6cda766093120a6fb5b855debdddb71ae2ab537f116491994d8fb51429e", + "installpath": "/etc/rdk/certs" + } +] + diff --git a/recipes-images/rdk-fullstack-image.bb b/recipes-images/rdk-fullstack-image.bb index 6f923aa..90239e9 100644 --- a/recipes-images/rdk-fullstack-image.bb +++ b/recipes-images/rdk-fullstack-image.bb @@ -11,10 +11,6 @@ IMAGE_INSTALL = " \ inherit core-image custom-rootfs-creation extrausers -# TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609 -FILESEXTRAPATHS:prepend := "${THISDIR}:" -FACTORY_APPS_JSON_FILE ?= "file://factory-app-manifest.json" - IMAGE_ROOTFS_SIZE ?= "8192" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" From ab0f6a29bbda4df521be304a7c863afb0f78ce2d Mon Sep 17 00:00:00 2001 From: Arun Madhavan Date: Tue, 17 Mar 2026 13:41:32 -0400 Subject: [PATCH 5/5] RDKMVE-1814: remove duplicate manifest --- recipes-images/factory-app-manifest.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 recipes-images/factory-app-manifest.json diff --git a/recipes-images/factory-app-manifest.json b/recipes-images/factory-app-manifest.json deleted file mode 100644 index c0ea536..0000000 --- a/recipes-images/factory-app-manifest.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "packagename": "com.rdkcentral.base", - "srcuri": "file://com.rdkcentral.base+0.1.0.bolt", - "sha256sum": "d2386dd012e422e737ed2cc66201726bb9e680bc753ed29c46547d3fa0225c1b", - "installpath":"/etc/rdk/factoryapps" - }, - { - "packagename": "com.rdkcentral.wpe-rdk", - "srcuri": "file://com.rdkcentral.wpe-rdk+0.1.0.bolt", - "sha256sum": "8016d174a029eaa9549a64aa888e3189e8219ad62671222ca7460c1ae150c392" - }, - { - "packagename": "com.rdkcentral.refui", - "srcuri": "file://com.rdkcentral.refui+0.0.4.bolt", - "sha256sum": "f94c9f7bdb30d5df368623aa87543e143a68e70043bf29128f5913d5bbb367fd" - }, - { - "packagename": "com.rdkcentral.ralf.crt", - "srcuri": "file://com.rdkcentral.ralf.crt", - "sha256sum": "a71aa6cda766093120a6fb5b855debdddb71ae2ab537f116491994d8fb51429e", - "installpath":"/etc/rdk/certs" - } -]