Skip to content

Commit 382b4d9

Browse files
committed
greengrass-component: move RDEPENDS on greengrass-* into component
This is done to pass the yocto checklayer test that otherwise fail, as it always is using poky to run tests that do not have systemd as init manager.
1 parent 26f8213 commit 382b4d9

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

.github/workflows/yocto-check-layer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
run: |
4343
cd yocto_checklayer/
4444
source poky/oe-init-build-env build
45-
echo DISTRO = \"poky-altcfg\" >> conf/local.conf
4645
yocto-check-layer ../meta-aws/ --dependency ../meta-openembedded/meta-oe/ ../meta-openembedded/meta-python/ ../meta-openembedded/meta-multimedia ../meta-openembedded/meta-networking --output-log ycl-check_meta-aws.log --debug --no-auto --no-auto-dependency
4746
- name: save test result
4847
uses: actions/upload-artifact@v4

classes/greengrass-lite-component.bbclass

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,3 @@ do_install:prepend() {
121121

122122
# Package the appropriate directories based on mode
123123
FILES:${PN} += "${@'${GGL_PACKAGES_DIR}/*' if d.getVar('GREENGRASS_LITE_ZERO_COPY') == '1' else '${GGL_IMAGE_COMPONENTS_ROOT}/*'}"
124-
125-
# Runtime dependency on greengrass-lite
126-
RDEPENDS:${PN} += "greengrass-lite"

recipes-iot/aws-iot-greengrass/greengrass-component-helloworld-bash_1.0.0.bb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ GREENGRASS_VARIANT ?= "lite"
2222
inherit_defer ${@'greengrass-lite-component' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-component'}
2323
inherit ptest
2424

25+
RDEPENDS:${PN} += "${@'greengrass-lite' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-bin'}"
26+
2527
SRC_URI = " \
2628
file://component-recipe.yaml \
2729
file://run-ptest \

recipes-iot/aws-iot-greengrass/greengrass-component-helloworld-python_1.0.0.bb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ RDEPENDS:${PN} += "aws-iot-device-sdk-python-v2"
2929
RDEPENDS:${PN} += "${@'bash' if d.getVar('GREENGRASS_VARIANT') == 'classic' else ''}"
3030
RDEPENDS:${PN}-ptest += "bash"
3131

32+
RDEPENDS:${PN} += "${@'greengrass-lite' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-bin'}"
33+
3234
do_install:append() {
3335
if [ "${GREENGRASS_VARIANT}" = "lite" ]; then
3436
install -m 0755 ${UNPACKDIR}/hello_world.py ${D}${GGL_ARTIFACTS_DIR}/${COMPONENT_NAME}/${COMPONENT_VERSION}/

recipes-iot/aws-iot-greengrass/greengrass-component-helloworld-sdk-lite_1.0.0.bb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ PACKAGECONFIG[static] = "-DUSE_STATIC_LIBS=ON,-DUSE_STATIC_LIBS=OFF"
4141
inherit cmake ptest
4242
inherit_defer ${@'greengrass-lite-component' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-component'}
4343

44+
RDEPENDS:${PN} += "${@'greengrass-lite' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-bin'}"
45+
4446
FILES:${PN}-ptest += "${PTEST_PATH}/*"
4547

4648
do_install:append() {

0 commit comments

Comments
 (0)