Skip to content

Commit 3611159

Browse files
authored
Merge pull request #15255 from aws4embeddedlinux/whinlatter-next
Release: Merge whinlatter-next to whinlatter
2 parents 13e10dc + 59a385c commit 3611159

File tree

33 files changed

+110
-85
lines changed

33 files changed

+110
-85
lines changed

.github/workflows/build-test-recipe.yml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,27 @@ jobs:
9999
with:
100100
path: ${{ github.workspace }}/meta-aws
101101
- name: Checkout BitBake
102-
run: git clone https://git.openembedded.org/bitbake -b master ${{ github.workspace }}/bitbake
102+
run: |
103+
# Map Yocto release to BitBake version
104+
case "${{ needs.changed.outputs.release }}" in
105+
kirkstone)
106+
BITBAKE_BRANCH="2.0"
107+
;;
108+
scarthgap)
109+
BITBAKE_BRANCH="2.8"
110+
;;
111+
whinlatter)
112+
BITBAKE_BRANCH="2.16"
113+
;;
114+
master)
115+
BITBAKE_BRANCH="master"
116+
;;
117+
*)
118+
echo "Unknown release: ${{ needs.changed.outputs.release }}"
119+
exit 1
120+
;;
121+
esac
122+
git clone https://git.openembedded.org/bitbake -b $BITBAKE_BRANCH ${{ github.workspace }}/bitbake
103123
- name: Initialize Build Environment
104124
run: |
105125
chown -R yoctouser .
@@ -130,12 +150,7 @@ jobs:
130150
export RECIPES=$( echo "${{ needs.changed.outputs.diff }}" | tr ' ' '\n' | grep '\.bb.*$' | sed 's!.*/!!' | sed 's!.bb!!' | sed 's!_.*!!' | sort | uniq | sed -z $'s/\\\n/ /g')
131151
if [ "" == "$RECIPES" ]; then
132152
echo "No changed recipes, adding everything with a ptest to test, build"
133-
THINGS_TO_EXCLUDE="! -name aws-lc* ! -name neo-ai-tv* ! -name corretto-17-bin* ! -name corretto-21-bin* ! -name corretto-8-bin* ! -name corretto-25-bin* ! -name firecracker-bin* ! -name jailer-bin* ! -name amazon-kvs-producer-sdk-c* ! -name aws-cli-v2* ! -name aws-iot-device-sdk-embedded-c* "
134-
if [ ${{ matrix.machine }} == "qemuarm" ]; then
135-
THINGS_TO_EXCLUDE+="! -name amazon-kvs-webrtc-sdk* ! -name amazon-kvs-producer-pic* ! -name amazon-cloudwatch-agent*"
136-
elif [ ${{ matrix.machine }} == "qemuriscv64" ]; then
137-
THINGS_TO_EXCLUDE+="! -name amazon-cloudwatch-agent* ! -name corretto-* ! -name greengrass-bin* ! -name aws-sdk-cpp* ! -name amazon-kvs-producer-pic* ! -name amazon-kvs-webrtc-sdk*"
138-
fi
153+
THINGS_TO_EXCLUDE="! -name aws-lc* ! -name neo-ai-tv* ! -name corretto-17-bin* ! -name corretto-21-bin* ! -name corretto-8-bin* ! -name corretto-25-bin* ! -name firecracker-bin* ! -name jailer-bin* ! -name amazon-kvs-producer-sdk-c* ! -name aws-cli-v2* ! -name aws-iot-device-sdk-embedded-c* ! -name greengrass_* ! -name greengrass-bin* "
139154
export RECIPES=$(find meta-aws/ -name *.bb -type f \( ${THINGS_TO_EXCLUDE} \) -print | xargs grep -l 'inherit.*ptest.*'| sed 's!.*/!!' | sed 's!.bb!!' | sed 's!_.*!!' | sort | uniq | sed -z $'s/\\\n/ /g')
140155
echo THINGS_TO_EXCLUDE: $THINGS_TO_EXCLUDE
141156
fi
@@ -275,8 +290,9 @@ jobs:
275290
export SSTATE_DIR=/sstate-cache
276291
export DL_DIR=/downloads
277292
export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS SSTATE_DIR DL_DIR"
293+
bitbake core-image-minimal -c testdata_json -f
278294
bitbake core-image-minimal
279-
bitbake core-image-minimal -f -c testimage
295+
bitbake core-image-minimal -c testimage
280296
resulttool report tmp/log/oeqa/testresults.json | tee -a ${{ matrix.machine }}-resulttool_report.txt'
281297
set -e
282298
echo RECIPES to test: $RECIPES
@@ -288,3 +304,13 @@ jobs:
288304
with:
289305
name: ${{ matrix.machine }}-resulttool_report.txt
290306
path: /home/yoctouser/bitbake-builds/poky-without-meta-aws-poky-distro_poky-altcfg-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-resulttool_report.txt
307+
- name: Save test failure logs
308+
if: '!cancelled()'
309+
uses: actions/upload-artifact@v4
310+
with:
311+
name: ${{ matrix.machine }}-test-logs
312+
path: |
313+
/home/yoctouser/bitbake-builds/poky-without-meta-aws-poky-distro_poky-altcfg-machine_${{ matrix.machine }}/build/tmp/work/**/temp/log.do_rootfs.*
314+
/home/yoctouser/bitbake-builds/poky-without-meta-aws-poky-distro_poky-altcfg-machine_${{ matrix.machine }}/build/tmp/work/**/temp/log.do_testimage.*
315+
/home/yoctouser/bitbake-builds/poky-without-meta-aws-poky-distro_poky-altcfg-machine_${{ matrix.machine }}/build/tmp/log/oeqa/testresults.json
316+
if-no-files-found: ignore

recipes-containers/firecracker-bin/firecracker-bin_1.14.1.bb renamed to recipes-containers/firecracker-bin/firecracker-bin_1.14.2.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ COMPATIBLE_HOST:arm = "null"
1818
# nooelint: oelint.vars.srcurichecksum
1919
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"
2020

21-
SRC_URI[x86_64.sha256sum] = "ea66dc1fbdb2473bbb95a1e822ae7884cd575a891a8f801258723258d36b7c7c"
22-
SRC_URI[aarch64.sha256sum] = "65a39256b9dd741e20c3a3fe5055cb38e5159049b5ede2015604951521000a04"
21+
SRC_URI[x86_64.sha256sum] = "c9f112a983783f3cf50feea9e69b8ea9eb7475e52159a9585ca9555be630f5a3"
22+
SRC_URI[aarch64.sha256sum] = "7418f619e7262b24431cf955d2346e5de4d950302ea1a0ff1af50a15fdea22f4"
2323

2424
UPGRADE_ARCHS = "x86_64 aarch64"
2525
RECIPE_UPGRADE_EXTRA_TASKS = "update_other_arch_checksum"

recipes-containers/firecracker-bin/jailer-bin_1.14.1.bb renamed to recipes-containers/firecracker-bin/jailer-bin_1.14.2.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ COMPATIBLE_HOST:arm = "null"
1818
# nooelint: oelint.vars.srcurichecksum
1919
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"
2020

21-
SRC_URI[x86_64.sha256sum] = "ea66dc1fbdb2473bbb95a1e822ae7884cd575a891a8f801258723258d36b7c7c"
22-
SRC_URI[aarch64.sha256sum] = "65a39256b9dd741e20c3a3fe5055cb38e5159049b5ede2015604951521000a04"
21+
SRC_URI[x86_64.sha256sum] = "c9f112a983783f3cf50feea9e69b8ea9eb7475e52159a9585ca9555be630f5a3"
22+
SRC_URI[aarch64.sha256sum] = "7418f619e7262b24431cf955d2346e5de4d950302ea1a0ff1af50a15fdea22f4"
2323

2424
UPGRADE_ARCHS = "x86_64 aarch64"
2525
RECIPE_UPGRADE_EXTRA_TASKS = "update_other_arch_checksum"

recipes-devtools/python/python3-boto3_1.42.51.bb renamed to recipes-devtools/python/python3-boto3_1.42.62.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI = "\
1212
file://python_dependency_test.py \
1313
"
1414

15-
SRCREV = "bf41321e5f7500eef5427df0aab2e8c39e581b5f"
15+
SRCREV = "1e80b23d1443d49f1535fc83aaa91b239fecca11"
1616

1717
inherit setuptools3 ptest
1818

recipes-devtools/python/python3-botocore_1.42.51.bb renamed to recipes-devtools/python/python3-botocore_1.42.62.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI = "\
1212
file://python_dependency_test.py \
1313
"
1414

15-
SRCREV = "9d9af7311c4d4bc65e938c9f189e77f2b8a6ac64"
15+
SRCREV = "d66a4ce2c4d7f6fdb347aea93bdab7d1f5e063aa"
1616

1717
inherit setuptools3 ptest
1818

recipes-iot/aws-iot-greengrass/greengrass-lite_2.3.2.bb renamed to recipes-iot/aws-iot-greengrass/greengrass-lite_2.3.3.bb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SRC_URI = "\
3434
git://github.com/aws-greengrass/aws-greengrass-lite.git;protocol=https;branch=release/2.3.x;name=ggl \
3535
${@'' if d.getVar('DISABLE_FETCHCONTENT') else 'git://github.com/FreeRTOS/coreMQTT.git;protocol=https;branch=main;name=mqtt;destsuffix=${S}/thirdparty/core_mqtt'} \
3636
${@'' if d.getVar('DISABLE_FETCHCONTENT') else 'git://github.com/aws/SigV4-for-AWS-IoT-embedded-sdk.git;protocol=https;branch=main;name=sigv4;destsuffix=${S}/thirdparty/aws_sigv4'} \
37-
${@'' if d.getVar('DISABLE_FETCHCONTENT') else 'git://github.com/aws-greengrass/aws-greengrass-component-sdk.git;protocol=https;branch=main;name=sdk;destsuffix=${S}/thirdparty/gg_sdk'} \
37+
${@'' if d.getVar('DISABLE_FETCHCONTENT') else 'git://github.com/aws-greengrass/aws-greengrass-component-sdk.git;protocol=https;nobranch=1;name=sdk;destsuffix=${S}/thirdparty/gg_sdk'} \
3838
file://001-disable_strip.patch \
3939
file://greengrass-lite.yaml \
4040
file://run-ptest \
@@ -46,7 +46,7 @@ SRC_URI = "\
4646
${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','file://ggl.aws.greengrass.TokenExchangeService.service.d-fleet-provisioning.conf','',d)} \
4747
"
4848

49-
SRCREV_ggl = "5488d8f34d355a04e66612981ab3edfafc8386a2"
49+
SRCREV_ggl = "cd020bf3bf5ebe8c13e4cebcc71c6349aa86ea44"
5050

5151
# must match fc_deps.json
5252

@@ -55,7 +55,7 @@ SRCREV_mqtt = "f1827d8b46703f1c5ff05d21b34692d3122c9a04"
5555
# nooelint: oelint.vars.specific
5656
SRCREV_sigv4 = "f0409ced6c2c9430f0e972019b7e8f20bbf58f4e"
5757
# nooelint: oelint.vars.specific
58-
SRCREV_sdk = "08be374523066becf92dce52c84d3cb9bf3825a5"
58+
SRCREV_sdk = "v0.4.1"
5959

6060
EXTRA_OECMAKE:append = " \
6161
${@'' if d.getVar('DISABLE_FETCHCONTENT') else '-DFETCHCONTENT_SOURCE_DIR_CORE_MQTT=${S}/thirdparty/core_mqtt'} \

recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SRC_URI = "\
2525
file://0005-fix-boost-system-header-only.patch \
2626
file://run-ptest \
2727
"
28-
SRCREV = "293f74d04012ea78fecb651896b27489770219f7"
28+
SRCREV = "3812a511aa0c730c00fad8128482449deb697292"
2929

3030
UPSTREAM_CHECK_COMMITS = "1"
3131

recipes-iot/aws-iot-securetunneling-localproxy/files/0001-boost-support-any.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a2304f3c1bf919ff60d7ad6ad6dc6866c8ff5ab9 Mon Sep 17 00:00:00 2001
1+
From df936dde160aac33dede50c5ca83e4241424910c Mon Sep 17 00:00:00 2001
22
From: Thomas Roos <throos@amazon.de>
33
Date: Fri, 10 Mar 2023 12:46:05 +0000
44
Subject: [PATCH] aws-iot-securetunneling-localproxy: support any boost version

recipes-iot/aws-iot-securetunneling-localproxy/files/0002-remove-cxx-standard.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5b91070b46636aeee90474f1b547f244607f8312 Mon Sep 17 00:00:00 2001
1+
From ea60a17429163d1ea28f5e311a63687cf41dd4d4 Mon Sep 17 00:00:00 2001
22
From: Thomas Roos <throos@amazon.de>
33
Date: Tue, 9 Jan 2024 14:34:32 +0000
44
Subject: [PATCH] aws-iot-securetunneling-localproxy: remove setting of

recipes-iot/aws-iot-securetunneling-localproxy/files/0004-cmake-version.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1252be32ffa8543520a2926095889087d50b1ee2 Mon Sep 17 00:00:00 2001
1+
From 6b2032f78a80284c9471b27f73525cda48960c4a Mon Sep 17 00:00:00 2001
22
From: OpenEmbedded <oe.patch@oe>
33
Date: Tue, 22 Oct 2024 02:00:39 +0000
44
Subject: [PATCH] aws-iot-securetunneling-localproxy: upgrade git -> new

0 commit comments

Comments
 (0)