fix build issue [v2] Fix subject line
Signed-off-by: Armin Kuster <[email protected]> --- .../ibmswtpm2/files/remove_optimization.patch | 26 ++++++++++++++++++ .../recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb | 24 ----------------- .../recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb | 27 +++++++++++++++++++ 3 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/files/remove_optimization.patch delete mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb create mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/files/remove_optimization.patch b/meta-tpm/recipes-tpm2/ibmswtpm2/files/remove_optimization.patch new file mode 100644 index 0000000..2919e2e --- /dev/null +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/files/remove_optimization.patch @@ -0,0 +1,26 @@ +Allow recipe to overide optimization. + +fixes: + +397 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) +| | ^~~~~~~ +| cc1: all warnings being treated as errors + + +Upstream-Status: OE specific + +Signed-off-by: Armin Kuster <[email protected]> + +Index: src/makefile +=================================================================== +--- src.orig/makefile ++++ src/makefile +@@ -43,7 +43,7 @@ CC = /usr/bin/gcc + CCFLAGS = -Wall \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Werror -Wsign-compare \ +- -c -ggdb -O0 \ ++ -c -ggdb -O \ + -DTPM_POSIX \ + -D_POSIX_ \ + -DTPM_NUVOTON diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb deleted file mode 100644 index a6068e6..0000000 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "IBM's Software TPM 2.0" - -LICENSE = "BSD" -SECTION = "securty/tpm" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f" - -SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm1332.tar.gz"; -SRC_URI[md5sum] = "0ab34a655b4e09812d7ada19746af4f9" -SRC_URI[sha256sum] = "8e8193af3d11d9ff6a951dda8cd1f4693cb01934a8ad7876b84e92c6148ab0fd" - -DEPENDS = "openssl" - -S = "${WORKDIR}/src" - -LDFLAGS = "${LDFALGS}" - -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_1563.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb new file mode 100644 index 0000000..8054226 --- /dev/null +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb @@ -0,0 +1,27 @@ +SUMMARY = "IBM's Software TPM 2.0" +LICENSE = "BSD" +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://remove_optimization.patch \ + " +SRC_URI[md5sum] = "13013612b3a13dc935fefe1a5684179c" +SRC_URI[sha256sum] = "fc3a17f8315c1f47670764f2384943afc0d3ba1e9a0422dacb08d455733bd1e9" +SRC_URI[sha1sum] = "a2a5335024a2edc1739f08b99e716fa355be627d" +SRC_URI[sha384sum] = "b1f278acabe2198aa79c0fe8aa0182733fe701336cbf54a88058be0b574cab768f59f9315882d0e689e634678d05b79f" +SRC_URI[sha512sum] = "ff0b9e5f0d0070eb572b23641f7a0e70a8bc65cbf4b59dca1778be3bb014124011221a492147d4c492584e87af23e2f842ca6307641b3919f67a3f27f09312c0" + +S = "${WORKDIR}/src" + +do_compile () { + make CC='${CC}' +} + +do_install () { + install -d ${D}/${bindir} + install -m 0755 tpm_server ${D}/${bindir} +} + -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#48321): https://lists.yoctoproject.org/g/yocto/message/48321 Mute This Topic: https://lists.yoctoproject.org/mt/71113454/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
