layers: Add whinlatter (5.3) to compatible layer series
PATCH 1/3 layers: Add whinlatter (5.3) to compatible layer series
Signed-off-by Khem Raj <[email protected]>
--- meta-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf | 2 +- meta-networking/conf/layer.conf | 2 +- meta-oe/conf/layer.conf | 2 +- meta-perl/conf/layer.conf | 2 +- meta-python/conf/layer.conf | 2 +- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)
meta-filesystems/conf/layer.conf +1 -1
@@ -15,7 +15,7 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_filesystems-layer = "walnascar" +LAYERSERIES_COMPAT_filesystems-layer = "walnascar whinlatter" BBFILES_DYNAMIC += " \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
meta-gnome/conf/layer.conf +1 -1
@@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" -LAYERSERIES_COMPAT_gnome-layer = "walnascar" +LAYERSERIES_COMPAT_gnome-layer = "walnascar whinlatter" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \
meta-initramfs/conf/layer.conf +1 -1
@@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "5" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "walnascar" +LAYERSERIES_COMPAT_meta-initramfs = "walnascar whinlatter" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \
meta-multimedia/conf/layer.conf +1 -1
@@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "walnascar" +LAYERSERIES_COMPAT_multimedia-layer = "walnascar whinlatter"
meta-networking/conf/layer.conf +1 -1
@@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" -LAYERSERIES_COMPAT_networking-layer = "walnascar" +LAYERSERIES_COMPAT_networking-layer = "walnascar whinlatter" LICENSE_PATH += "${LAYERDIR}/licenses"
meta-oe/conf/layer.conf +1 -1
@@ -48,7 +48,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "walnascar" +LAYERSERIES_COMPAT_openembedded-layer = "walnascar whinlatter" LICENSE_PATH += "${LAYERDIR}/licenses"
meta-perl/conf/layer.conf +1 -1
@@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "walnascar" +LAYERSERIES_COMPAT_perl-layer = "walnascar whinlatter"
meta-python/conf/layer.conf +1 -1
@@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "walnascar" +LAYERSERIES_COMPAT_meta-python = "walnascar whinlatter" LICENSE_PATH += "${LAYERDIR}/licenses"
meta-webserver/conf/layer.conf +1 -1
@@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "walnascar" +LAYERSERIES_COMPAT_webserver = "walnascar whinlatter" LICENSE_PATH += "${LAYERDIR}/licenses"
meta-xfce/conf/layer.conf +1 -1
@@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "walnascar" +LAYERSERIES_COMPAT_xfce-layer = "walnascar whinlatter" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \
PATCH 2/3 kernel-selftest: Convert to use a dedicated UNPACKDIR
Avoid following warning by using a dedicated unpack directory for sources.
WARNING: kernel-selftest-1.0-r0 do_unpack: kernel-selftest: the directory ${WORKDIR}/${BP} (/home/kraj200/yoe/build/tmp/work/qemux86_64-yoe-linux/kernel-self test/1.0/kernel-selftest-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-kernel/kernel-selftest/kernel-selftest.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +4 -5
@@ -2,10 +2,13 @@ SUMMARY = "Kernel selftest for Linux" DESCRIPTION = "Kernel selftest for Linux" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS = "rsync-native llvm-native" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + # for musl libc SRC_URI:append:libc-musl = "\ file://userfaultfd.patch \
@@ -108,10 +111,6 @@ do_install() { chown root:root -R ${D}/usr/kernel-selftest } -do_configure() { - install -D -m 0644 ${UNPACKDIR}/COPYING ${S}/COPYING -} - do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" python copy_kselftest_source_from_kernel() { sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split()
PATCH 3/3 libspdm: Fix build with openssl 3.5
In reply to Khem RajBackport new API signature, since the vendored version of openssl in libspdm is 3.0.14, asn1.h has to sync for providing it.
Signed-off-by Khem Raj <[email protected]>
Cc Alistair Francis <[email protected]>
Cc Martin Jansa <[email protected]>
--- ...port-API-introduced-in-openssl-3.5.0.patch | 33 +++++++++++++++++++ .../recipes-support/libspdm/libspdm_3.7.0.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 92f6c3d8fa26d9019ba27e0c1aa894517ada93b9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 11 Apr 2025 17:47:05 -0700 +Subject: [PATCH] Backport API introduced in openssl 3.5.0 + +This commit [1] introduced this new API which is used by pem.h from +openssl and it should be provided by asn1.h which is vendored here so +it goes out of sync and causes build errors e.g + +In file included from ./os_stub/cryptlib_openssl/pk/x509.c:18: +/usr/include/openssl/pem.h:399:28: error: unknown type name 'OSSL_i2d_of_void_ctx' + 399 | int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx, + +[1] https://github.com/openssl/openssl/commit/35f6e7ea02b599d5aaf220b4720cbadd946d8023 + +Upstream-Status: Submitted [https://github.com/DMTF/libspdm/pull/3033] +Signed-off-by: Khem Raj <[email protected]> +--- + os_stub/openssllib/openssl_gen/openssl/asn1.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/os_stub/openssllib/openssl_gen/openssl/asn1.h b/os_stub/openssllib/openssl_gen/openssl/asn1.h +index a90152ee..fcfbe42e 100644 +--- a/os_stub/openssllib/openssl_gen/openssl/asn1.h ++++ b/os_stub/openssllib/openssl_gen/openssl/asn1.h +@@ -368,6 +368,7 @@ typedef struct ASN1_VALUE_st ASN1_VALUE; + + typedef void *d2i_of_void(void **, const unsigned char **, long); + typedef int i2d_of_void(const void *, unsigned char **); ++typedef int OSSL_i2d_of_void_ctx(const void *, unsigned char **, void *vctx); + + /*- + * The following macros and typedefs allow an ASN1_ITEM
meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb +2 -1
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7" DEPENDS = "openssl" -SRC_URI = "git://github.com/DMTF/libspdm.git;branch=main;protocol=https" +SRC_URI = "git://github.com/DMTF/libspdm.git;branch=main;protocol=https \ + file://0001-Backport-API-introduced-in-openssl-3.5.0.patch" SRCREV = "1be116c7b7713fa9003e1bd53b53a34758549eb9" S = "${WORKDIR}/git"