Skip to content

Commit 01a36e9

Browse files
authored
Merge branch 'walnascar-next' into backport-13859-to-walnascar-next
2 parents 1a701f4 + 493a051 commit 01a36e9

File tree

7 files changed

+27
-18
lines changed

7 files changed

+27
-18
lines changed

recipes-containers/firecracker-bin/firecracker-bin_1.10.1.bb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ DESCRIPTION = "Secure and fast microVMs for serverless computing."
33
HOMEPAGE = "https://firecracker-microvm.github.io/"
44
CVE_PRODUCT = "firecracker"
55
LICENSE = "Apache-2.0"
6-
# nooelint: oelint.var.licenseremotefile:License-File
7-
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
6+
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
87

98
ARCH_DIR:x86-64 = "x86_64"
109
ARCH_DIR:aarch64 = "aarch64"
@@ -13,6 +12,9 @@ COMPATIBLE_MACHINE = "null"
1312
COMPATIBLE_MACHINE:aarch64 = "(.*)"
1413
COMPATIBLE_MACHINE:x86-64 = "(.*)"
1514

15+
# nooelint: oelint.vars.specific
16+
COMPATIBLE_HOST:arm = "null"
17+
1618
# nooelint: oelint.vars.srcurichecksum
1719
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"
1820

@@ -27,7 +29,7 @@ SRC_URI:append = " \
2729
file://run-ptest \
2830
"
2931

30-
S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"
32+
S = "${UNPACKDIR}/release-v${PV}-${ARCH_DIR}"
3133

3234
inherit bin_package ptest
3335

@@ -42,7 +44,7 @@ FILES:${PN} += "\
4244
do_install() {
4345
install -d ${D}${bindir}
4446

45-
install -m 0755 ${S}/firecracker-v${PV}-${TARGET_ARCH} ${D}${bindir}/firecracker
47+
install -m 0755 ${S}/firecracker-v${PV}-${ARCH_DIR} ${D}${bindir}/firecracker
4648
}
4749

4850
# https://bugzilla.yoctoproject.org/show_bug.cgi?id=15227

recipes-containers/firecracker-bin/jailer-bin_1.10.1.bb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ DESCRIPTION = "Process for starting Firecracker in production scenarios; applies
33
HOMEPAGE = "https://firecracker-microvm.github.io/"
44
CVE_PRODUCT = "jailer"
55
LICENSE = "Apache-2.0"
6-
# nooelint: oelint.var.licenseremotefile:License-File
7-
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
6+
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
87

98
ARCH_DIR:x86-64 = "x86_64"
109
ARCH_DIR:aarch64 = "aarch64"
@@ -13,6 +12,9 @@ COMPATIBLE_MACHINE = "null"
1312
COMPATIBLE_MACHINE:aarch64 = "(.*)"
1413
COMPATIBLE_MACHINE:x86-64 = "(.*)"
1514

15+
# nooelint: oelint.vars.specific
16+
COMPATIBLE_HOST:arm = "null"
17+
1618
# nooelint: oelint.vars.srcurichecksum
1719
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"
1820

@@ -27,7 +29,7 @@ SRC_URI:append = " \
2729
file://run-ptest \
2830
"
2931

30-
S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"
32+
S = "${UNPACKDIR}/release-v${PV}-${ARCH_DIR}"
3133

3234
inherit bin_package ptest
3335

@@ -45,7 +47,7 @@ RDEPENDS:${PN}-ptest += "\
4547
do_install() {
4648
install -d ${D}${bindir}
4749

48-
install -m 0755 ${S}/jailer-v${PV}-${TARGET_ARCH} ${D}${bindir}/jailer
50+
install -m 0755 ${S}/jailer-v${PV}-${ARCH_DIR} ${D}${bindir}/jailer
4951
}
5052

5153
# https://bugzilla.yoctoproject.org/show_bug.cgi?id=15227

recipes-sdk/aws-c-cal/aws-c-cal_0.9.3.bb renamed to recipes-sdk/aws-c-cal/aws-c-cal_0.9.4.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SRC_URI = "\
2121
file://run-ptest \
2222
"
2323

24-
SRCREV = "cdd052bf0ac38d72177d6376ea668755fca13df4"
24+
SRCREV = "3c6d901abf536928cd3775e46ea6bec5d47f4d51"
2525

2626
S = "${UNPACKDIR}/git"
2727

recipes-sdk/aws-c-cal/files/001-enable-tests-with-crosscompiling.patch

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
This enable the tests even when crosscompiling.
1+
From 1ecec3f435edef2d3fb22c5db9ba6d04cbe4adb9 Mon Sep 17 00:00:00 2001
2+
From: Thomas Roos <throos@amazon.de>
3+
Date: Mon, 29 Sep 2025 12:51:03 +0000
4+
Subject: [PATCH] This enable the tests even when crosscompiling.
25

36
Upstream-Status: Inappropriate [oe specific]
7+
---
8+
CMakeLists.txt | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
410

5-
Index: aws-c-cal-0.9.3/CMakeLists.txt
6-
===================================================================
7-
--- aws-c-cal-0.9.3.orig/CMakeLists.txt
8-
+++ aws-c-cal-0.9.3/CMakeLists.txt
11+
diff --git a/CMakeLists.txt b/CMakeLists.txt
12+
index 29ff105..666b31b 100644
13+
--- a/CMakeLists.txt
14+
+++ b/CMakeLists.txt
915
@@ -218,7 +218,7 @@ install(FILES ${EXPORT_MODULES}
1016
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/modules"
1117
COMPONENT Development)
12-
18+
1319
-if (NOT CMAKE_CROSSCOMPILING AND NOT BYO_CRYPTO)
1420
+if (NOT BYO_CRYPTO)
1521
include(CTest)

recipes-sdk/s2n/s2n/run-ptest

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ TESTS="\
167167
./s2n_mem_usage_test \
168168
./s2n_mutual_auth_test \
169169
./s2n_optional_client_auth_test \
170-
./s2n_override_openssl_random_test \
171170
./s2n_pem_rsa_dhe_test \
172171
./s2n_pem_test \
173172
./s2n_pkey_test \

recipes-support/aws-cli-v2/aws-cli-v2_2.31.12.bb renamed to recipes-support/aws-cli-v2/aws-cli-v2_2.31.14.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SRC_URI = "\
3232
file://run-ptest \
3333
"
3434

35-
SRCREV = "f0254a0ac90b04d8e56458042bbce39b6fcb714f"
35+
SRCREV = "d00b394b1633aec11785c6c643034f4c264e5225"
3636

3737
# version 2.x
3838
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"

recipes-support/aws-cli/aws-cli_1.42.49.bb renamed to recipes-support/aws-cli/aws-cli_1.42.51.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SRC_URI = "\
99
file://run-ptest \
1010
"
1111

12-
SRCREV = "29c68fec2ea304d086241e45e2f1285399b8994c"
12+
SRCREV = "01eca83f32419bc78824934b9ab24d5327fed797"
1313

1414
# version 2.x has got library link issues - so stick to version 1.x for now
1515
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>1\.\d+(\.\d+)+)"

0 commit comments

Comments
 (0)