From fb28801eeeef53cb6cc0096d1938a93bea323597 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sat, 13 Apr 2024 21:25:24 +0800 Subject: [PATCH] ibmswtpm2: upgrade 164-2020-192.1 -> 183-2024-03-27 Remove '-DALG_CAMELLIA=ALG_NO' from CFLAGS to fix compile error: | TpmProfile_Common.h:109: error: "ALG_CAMELLIA" redefined [-Werror] | 109 | #define ALG_CAMELLIA ALG_YES | | Signed-off-by: Yi Zhao Signed-off-by: Armin Kuster --- ...swtpm2_164-2020-192.1.bb => ibmswtpm2_183-2024-03-27.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_164-2020-192.1.bb => ibmswtpm2_183-2024-03-27.bb} (86%) diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_183-2024-03-27.bb similarity index 86% rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_183-2024-03-27.bb index 7060a64..7ed9569 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_183-2024-03-27.bb @@ -19,13 +19,13 @@ DEPENDS = "openssl" SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \ file://tune-makefile.patch \ " -SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b" +SRCREV = "c37c74438429e1d5fe465232e7bf894b239a2cd4" -UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2" +UPSTREAM_CHECK_GITTAGREGEX = "rev(?P\d+(\-\d+)+)" S = "${WORKDIR}/git/src" -CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO" +CFLAGS += "-Wno-error=maybe-uninitialized" do_compile () { make CC='${CC}'