remove rpi4, fix pattern matching for rpi2

aws4embeddedlinux · Nov 29, 2024 · 96c2b3a · 96c2b3a
1 parent 5899af1
commit 96c2b3a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 56 deletions.
diff --git a/.github/workflows/build-gg-lite.yml b/.github/workflows/build-gg-lite.yml
@@ -86,7 +86,7 @@ jobs:
              cat ${{ github.workspace }}/.github/workflows/build-gg-artifacts/readme-license.txt >> ${{ github.workspace }}/zipfile/readme.txt
              sed -i 's|{{ VERSION_LINK }}|${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|g' ${{ github.workspace }}/zipfile/readme.txt
       - name: cp image (raspberrypi) to zip dir
-        if:  startsWith(matrix.device, 'raspberrypi[15]')
+        if: matrix.device == 'raspberrypi[1-5]'
         shell: bash
         run: |
           cp ${{ github.workspace }}/build/tmp/deploy/images/${{ matrix.device }}/${{ matrix.image }}-${{ matrix.device }}.rootfs.rpi-sdimg ${{ github.workspace }}/zipfile/${{ matrix.image }}-${{ matrix.device }}.img

diff --git a/.github/workflows/build-gg.yml b/.github/workflows/build-gg.yml
@@ -84,7 +84,7 @@ jobs:
              cat ${{ github.workspace }}/.github/workflows/build-gg-artifacts/readme-license.txt >> ${{ github.workspace }}/zipfile/readme.txt
              sed -i 's|{{ VERSION_LINK }}|${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|g' ${{ github.workspace }}/zipfile/readme.txt
       - name: cp image (raspberrypi) to zip dir
-        if:  startsWith(matrix.device, 'raspberrypi[15]')
+        if: matrix.device == 'raspberrypi[1-5]'
         shell: bash
         run: |
           cp ${{ github.workspace }}/build/tmp/deploy/images/${{ matrix.device }}/${{ matrix.image }}-${{ matrix.device }}.rootfs.rpi-sdimg ${{ github.workspace }}/zipfile/${{ matrix.image }}-${{ matrix.device }}.img

diff --git a/meta-aws-demos/conf/devices/raspberrypi4/README.md b/meta-aws-demos/conf/devices/raspberrypi4/README.md
diff --git a/meta-aws-demos/conf/devices/raspberrypi4/config.conf b/meta-aws-demos/conf/devices/raspberrypi4/config.conf
diff --git a/meta-aws-demos/conf/devices/raspberrypi4/layers.conf b/meta-aws-demos/conf/devices/raspberrypi4/layers.conf
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite_git.bb b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite_git.bb
@@ -1,3 +1,5 @@
+SUMMARY = "AWS IoT Greengrass lite"
+DESCRIPTION = "AWS IoT Greengrass runtime for constrained devices"
 HOMEPAGE = "https://github.com/aws-greengrass/aws-greengrass-lite"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
@@ -15,7 +17,6 @@ DEPENDS += "\
     "
 
 DEPENDS:append:libc-musl = " argp-standalone"
-
 LDFLAGS:append:libc-musl = " -largp"
 
 ### enable CLANG instead of GCC
@@ -65,22 +66,22 @@ EXTRA_OECMAKE:append = " -DGGL_LOG_LEVEL=DEBUG"
 # CFLAGS:append = " -Werror"
 
 SYSTEMD_SERVICE:${PN} = "\
-    ggl.gg-ipc.socket.socket \
-    ggl.core.ggipcd.service \
-    ggl.gg_config.socket \
+    ggl.aws_iot_mqtt.socket \
+    ggl.aws_iot_tes.socket \
+    ggl.core.gg-fleet-statusd.service \
     ggl.core.ggconfigd.service \
-    ggl.gg_health.socket \
+    ggl.core.ggdeploymentd.service \
     ggl.core.gghealthd.service \
-    ggl.aws_iot_mqtt.socket \
-    ggl.core.iotcored.service \
-    ggl.gg_pubsub.socket \
+    ggl.core.ggipcd.service \
     ggl.core.ggpubsubd.service \
+    ggl.core.iotcored.service \
+    ggl.core.tesd.service \
+    ggl.gg_config.socket \
     ggl.gg_deployment.socket \
-    ggl.core.ggdeploymentd.service \
     ggl.gg_fleet_status.socket \
-    ggl.core.gg-fleet-statusd.service \
-    ggl.aws_iot_tes.socket \
-    ggl.core.tesd.service \
+    ggl.gg_health.socket \
+    ggl.gg_pubsub.socket \
+    ggl.gg-ipc.socket.socket \
     greengrass-lite.target \
 "