Conversation
There was a problem hiding this comment.
Pull request overview
Adds a factory app/certificate manifest to the image layer and wires the image recipe to reference it, enabling factory app manifest and cert installation support during image creation.
Changes:
- Added
FACTORY_APPS_JSON_FILEpointing to a newfactory-app-manifest.json. - Updated
FILESEXTRAPATHSto make the new manifest resolvable viafile://.... - Removed conditional
amazonuser/group creation previously tied toDISTRO_FEATURES=amazon_non_root_support.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| recipes-images/rdk-fullstack-image.bb | Adds manifest-related variables/paths; removes EXTRA_USERS_PARAMS logic for amazon_non_root_support. |
| recipes-images/factory-app-manifest.json | Introduces a factory app + cert manifest with package URIs and sha256 sums. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| "srcuri": "file://com.rdkcentral.ralf.crt", | ||
| "sha256sum": "a71aa6cda766093120a6fb5b855debdddb71ae2ab537f116491994d8fb51429e", | ||
| "installpath":"/etc/rdk/certs" | ||
| } |
| 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" |
| "sha256sum": "d2386dd012e422e737ed2cc66201726bb9e680bc753ed29c46547d3fa0225c1b", | ||
| "installpath":"/etc/rdk/factoryapps" | ||
| }, |
There was a problem hiding this comment.
Pull request overview
This PR updates the Yocto layer configuration to introduce a factory-apps manifest path variable and adds factory app manifest JSON file(s), while also removing a previously conditional extra user/group creation from the full-stack image recipe.
Changes:
- Removed conditional
EXTRA_USERS_PARAMSuser/group creation fromrdk-fullstack-image.bb. - Added
FACTORY_APPS_JSON_FILEtoconf/layer.confpointing to a layer-local factory app manifest. - Added factory app manifest JSON files at the layer root and under
recipes-images/.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| recipes-images/rdk-fullstack-image.bb | Removes conditional user/group creation; leaves extrausers inherit in place. |
| conf/layer.conf | Introduces FACTORY_APPS_JSON_FILE pointing to the root-level manifest. |
| factory-app-manifest.json | Adds a root-level factory app manifest (the one referenced by FACTORY_APPS_JSON_FILE). |
| recipes-images/factory-app-manifest.json | Adds a second manifest copy with inconsistent schema/fields and no in-layer references. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -11,11 +11,6 @@ IMAGE_INSTALL = " \ | |||
|
|
|||
| inherit core-image custom-rootfs-creation extrausers | |||
| LOCALCONF_VERSION = "1" | ||
|
|
||
| # TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609 | ||
| FACTORY_APPS_JSON_FILE ?= "${LAYERDIR}/factory-app-manifest.json" |
|
Test PR used to confirm the app manifest consumption to install the cart and factory apps. |
No description provided.