Skip to content

Commit f304dfc

Browse files
committed
Add wrynose (OpenEmbedded 5.0) compatibility
wrynose is the codename for the OE-core 5.0 / Yocto 5.1 release. Several changes are required for meta-wolfssl to build cleanly on this release: conf/layer.conf: - Add 'wrynose' to LAYERSERIES_COMPAT_wolfssl so bitbake accepts the layer without a compatibility warning/error. recipes-wolfssl/wolfssl/wolfssl_5.9.1.bb: - Remove explicit 'S = "${WORKDIR}/git"'. wrynose bitbake.conf now auto-derives S from the git fetcher using ${BP} as destsuffix; setting it to ${WORKDIR}/git triggers a fatal QA error: "Using S = ${WORKDIR} is no longer supported". - Fix RPROVIDES_${PN} -> RPROVIDES:${PN}. The underscore-based variable override syntax was removed in wrynose and causes a parse failure. inc/wolfcrypttest/wolfssl-enable-wolfcrypttest.inc: inc/wolfcryptbenchmark/wolfssl-enable-wolfcryptbenchmark.inc: - Add 'wrynose' to modern_series. Without this the version selector falls back to the legacy .inc file which contains do_install_append() syntax that bitbake rejects in wrynose. recipes-examples/wolfcrypt/wolfcrypttest/wolfcrypttest.bb: recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb: - Change S from "${WORKDIR}/git/wolfcrypt/{test,benchmark}" to "${UNPACKDIR}/${BP}/wolfcrypt/{test,benchmark}". In wrynose the git fetcher default destsuffix changed from 'git' to '${BP}', so the source tree lands at ${UNPACKDIR}/${BP}/ rather than ${WORKDIR}/git/. The old path causes do_populate_lic to fail with "LIC_FILES_CHKSUM points to an invalid file". Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
1 parent a727d86 commit f304dfc

6 files changed

Lines changed: 6 additions & 8 deletions

File tree

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ BBFILES += "${@bb.utils.contains('WOLFSSL_DEMOS', 'gnutls-nonfips-image-minimal'
180180
BBFILES += "${@bb.utils.contains('WOLFSSL_DEMOS', 'fips-image-minimal', '${LAYERDIR}/recipes-core/images/wolfssl-linux-fips-images/fips-image-minimal/*.bb ${LAYERDIR}/recipes-core/images/wolfssl-linux-fips-images/fips-image-minimal/*.bbappend', '', d)}"
181181

182182
# Versions of OpenEmbedded-Core which layer has been tested against
183-
LAYERSERIES_COMPAT_wolfssl = "sumo thud warrior zeus hardknott gatesgarth dunfell kirkstone nanbield langdale scarthgap"
183+
LAYERSERIES_COMPAT_wolfssl = "sumo thud warrior zeus hardknott gatesgarth dunfell kirkstone nanbield langdale scarthgap wrynose"

inc/wolfcryptbenchmark/wolfssl-enable-wolfcryptbenchmark.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def wolfssl_get_wolfcryptbenchmark_inc(d):
99
use_modern = False
1010
if layerseries:
1111
series_list = layerseries.split()
12-
modern_series = ['dunfell', 'gatesgarth', 'hardknott', 'honister', 'kirkstone', 'langdale', 'mickledore', 'nanbield', 'scarthgap']
12+
modern_series = ['dunfell', 'gatesgarth', 'hardknott', 'honister', 'kirkstone', 'langdale', 'mickledore', 'nanbield', 'scarthgap', 'wrynose']
1313
for series in series_list:
1414
if series in modern_series:
1515
use_modern = True

inc/wolfcrypttest/wolfssl-enable-wolfcrypttest.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def wolfssl_get_wolfcrypttest_inc(d):
99
use_modern = False
1010
if layerseries:
1111
series_list = layerseries.split()
12-
modern_series = ['dunfell', 'gatesgarth', 'hardknott', 'honister', 'kirkstone', 'langdale', 'mickledore', 'nanbield', 'scarthgap']
12+
modern_series = ['dunfell', 'gatesgarth', 'hardknott', 'honister', 'kirkstone', 'langdale', 'mickledore', 'nanbield', 'scarthgap', 'wrynose']
1313
for series in series_list:
1414
if series in modern_series:
1515
use_modern = True

recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SECTION = "x11/applications"
77

88
LICENSE = "GPL-3.0-only"
99
LIC_FILES_CHKSUM = "file://benchmark.c;beginline=1;endline=20;md5=34cdd4008eba44b62a19f9700e60d888"
10-
S = "${WORKDIR}/git/wolfcrypt/benchmark"
10+
S = "${UNPACKDIR}/${BP}/wolfcrypt/benchmark"
1111
DEPENDS += "virtual/wolfssl"
1212

1313
inherit wolfssl-compatibility

recipes-examples/wolfcrypt/wolfcrypttest/wolfcrypttest.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SECTION = "x11/applications"
77

88
LICENSE = "GPL-3.0-only"
99
LIC_FILES_CHKSUM = "file://test.c;beginline=1;endline=20;md5=881a8045bc665f7843d064f4465c360a"
10-
S = "${WORKDIR}/git/wolfcrypt/test"
10+
S = "${UNPACKDIR}/${BP}/wolfcrypt/test"
1111
DEPENDS += "virtual/wolfssl"
1212

1313
inherit wolfssl-compatibility

recipes-wolfssl/wolfssl/wolfssl_5.9.1.bb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
88
DEPENDS += "util-linux-native"
99

1010
PROVIDES += "wolfssl virtual/wolfssl"
11-
RPROVIDES_${PN} = "wolfssl"
11+
RPROVIDES:${PN} = "wolfssl"
1212

1313
SRC_URI = "git://github.com/wolfssl/wolfssl.git;nobranch=1;protocol=https;rev=1d363f3adceba9d1478230ede476a37b0dcdef24"
1414

15-
S = "${WORKDIR}/git"
16-
1715
inherit autotools pkgconfig wolfssl-helper
1816

1917
# Skip the package check for wolfssl itself (it's the base library)

0 commit comments

Comments
 (0)