From e73c62adf73139944e3085488df554333f0d8c30 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 30 Jul 2022 16:50:04 -0700 Subject: ibmswtpm2: update to 1682 fixes openssl 3.0 support Signed-off-by: Armin Kuster --- .../ibmswtpm2/files/tune-makefile.patch | 5 +-- meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb | 37 ---------------------- meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb | 36 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb create mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch b/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch index eebddb9..962bfc1 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch @@ -20,7 +20,7 @@ Index: src/makefile =================================================================== --- src.orig/makefile +++ src/makefile -@@ -38,12 +38,10 @@ +@@ -38,13 +38,11 @@ ################################################################################# @@ -29,12 +29,13 @@ Index: src/makefile CCFLAGS = -Wall \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Werror -Wsign-compare \ + -Wno-deprecated-declarations \ - -c -ggdb -O0 \ + -c -ggdb -O \ -DTPM_POSIX \ -D_POSIX_ \ -DTPM_NUVOTON -@@ -79,11 +77,11 @@ +@@ -80,11 +78,11 @@ TcpServerPosix.o : $(HEADERS) .PRECIOUS: %.o tpm_server: $(OBJFILES) diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb deleted file mode 100644 index c2cdf6a..0000000 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "IBM's Software TPM 2.0" -DESCRIPTION = "The software TPM 2.0 is targeted toward application development, \ -education, and virtualization. \ -\ -The intent is that an application can be developed using the software TPM. \ -The application should then run using a hardware TPM without changes. \ -Advantages of this approach: \ -* In contrast to a hardware TPM, it runs on many platforms and it's generally faster. \ -* Application software errors are easily reversed by simply removing the TPM state and starting over. \ -* Difficult crypto errors are quickly debugged by looking inside the TPM." -HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html" -LICENSE = "BSD-2-Clause" -SECTION = "securty/tpm" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f" - -DEPENDS = "openssl" - -SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ - file://tune-makefile.patch \ - " - -SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" - -S = "${WORKDIR}/src" - -CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO" - -do_compile () { - make CC='${CC}' -} - -do_install () { - install -d ${D}/${bindir} - install -m 0755 tpm_server ${D}/${bindir} -} diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb new file mode 100644 index 0000000..85fc7e0 --- /dev/null +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb @@ -0,0 +1,36 @@ +SUMMARY = "IBM's Software TPM 2.0" +DESCRIPTION = "The software TPM 2.0 is targeted toward application development, \ +education, and virtualization. \ +\ +The intent is that an application can be developed using the software TPM. \ +The application should then run using a hardware TPM without changes. \ +Advantages of this approach: \ +* In contrast to a hardware TPM, it runs on many platforms and it's generally faster. \ +* Application software errors are easily reversed by simply removing the TPM state and starting over. \ +* Difficult crypto errors are quickly debugged by looking inside the TPM." +HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html" +LICENSE = "BSD-2-Clause" +SECTION = "securty/tpm" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f" + +DEPENDS = "openssl" + +SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ + file://tune-makefile.patch \ + " +SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" + +S = "${WORKDIR}/src" + +CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO" + +do_compile () { + make CC='${CC}' +} + +do_install () { + install -d ${D}/${bindir} + install -m 0755 tpm_server ${D}/${bindir} +} -- cgit v1.2.3-54-g00ecf