diff options
author | Armin Kuster <akuster808@gmail.com> | 2022-07-30 16:50:04 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-08-02 13:45:26 -0700 |
commit | e73c62adf73139944e3085488df554333f0d8c30 (patch) | |
tree | b77678c94e411d3e511af50572a31b0c0f05a059 | |
parent | 67c42369b33ea85355afc0ccb31e88d3f0e47478 (diff) | |
download | meta-security-e73c62adf73139944e3085488df554333f0d8c30.tar.gz |
ibmswtpm2: update to 1682
fixes openssl 3.0 support
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch | 5 | ||||
-rw-r--r-- | meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb (renamed from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb) | 3 |
2 files changed, 4 insertions, 4 deletions
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 | |||
20 | =================================================================== | 20 | =================================================================== |
21 | --- src.orig/makefile | 21 | --- src.orig/makefile |
22 | +++ src/makefile | 22 | +++ src/makefile |
23 | @@ -38,12 +38,10 @@ | 23 | @@ -38,13 +38,11 @@ |
24 | ################################################################################# | 24 | ################################################################################# |
25 | 25 | ||
26 | 26 | ||
@@ -29,12 +29,13 @@ Index: src/makefile | |||
29 | CCFLAGS = -Wall \ | 29 | CCFLAGS = -Wall \ |
30 | -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ | 30 | -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ |
31 | -Werror -Wsign-compare \ | 31 | -Werror -Wsign-compare \ |
32 | -Wno-deprecated-declarations \ | ||
32 | - -c -ggdb -O0 \ | 33 | - -c -ggdb -O0 \ |
33 | + -c -ggdb -O \ | 34 | + -c -ggdb -O \ |
34 | -DTPM_POSIX \ | 35 | -DTPM_POSIX \ |
35 | -D_POSIX_ \ | 36 | -D_POSIX_ \ |
36 | -DTPM_NUVOTON | 37 | -DTPM_NUVOTON |
37 | @@ -79,11 +77,11 @@ | 38 | @@ -80,11 +78,11 @@ TcpServerPosix.o : $(HEADERS) |
38 | .PRECIOUS: %.o | 39 | .PRECIOUS: %.o |
39 | 40 | ||
40 | tpm_server: $(OBJFILES) | 41 | tpm_server: $(OBJFILES) |
diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb index c2cdf6a..85fc7e0 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb | |||
@@ -18,8 +18,7 @@ DEPENDS = "openssl" | |||
18 | SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ | 18 | SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ |
19 | file://tune-makefile.patch \ | 19 | file://tune-makefile.patch \ |
20 | " | 20 | " |
21 | 21 | SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f" | |
22 | SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147" | ||
23 | 22 | ||
24 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" | 23 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" |
25 | 24 | ||