Please rebase it on the latest master-next and resend. On Thu, Nov 13, 2025 at 6:35 PM Alistair Francis via lists.openembedded.org <[email protected]> wrote:
> From: Alistair Francis <[email protected]> > > Signed-off-by: Alistair Francis <[email protected]> > --- > ...port-API-introduced-in-openssl-3.5.0.patch | 33 ------------------- > .../{libspdm_3.7.0.bb => libspdm_3.8.1.bb} | 6 ++-- > 2 files changed, 2 insertions(+), 37 deletions(-) > delete mode 100644 > meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch > rename meta-oe/recipes-support/libspdm/{libspdm_3.7.0.bb => > libspdm_3.8.1.bb} (92%) > > diff --git > a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch > b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch > deleted file mode 100644 > index 2df9a18c68..0000000000 > --- > a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -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 > diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb > b/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb > similarity index 92% > rename from meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb > rename to meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb > index c6bbd1716b..431eb8fd40 100644 > --- a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb > +++ b/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb > @@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = > "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7" > > DEPENDS = "openssl" > > -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" > - > +SRC_URI = "git:// > github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https" > +SRCREV = "d7c8c8247b4d0bd8ed75d9f35a558a4df173a4c7" > > inherit cmake > > -- > 2.51.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121675): https://lists.openembedded.org/g/openembedded-devel/message/121675 Mute This Topic: https://lists.openembedded.org/mt/116286670/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
