summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@advantech.cz>2022-04-10 15:31:25 +0000
committerArmin Kuster <akuster808@gmail.com>2022-04-13 13:45:44 -0700
commitf576e383796725127c7339846d24bd2f7ab1d48c (patch)
tree65f05815f09ecfdfa455cbe43639bd0bef4edc35
parentda8cbb3b16447bb4a05839999a64f06448d8293e (diff)
downloadmeta-security-f576e383796725127c7339846d24bd2f7ab1d48c.tar.gz
tpm2-tss-engine: fix version string and build with openssl 3.0
Calling autoreconf outside git repo causes the version number to be null. This patch makes the version number fixed. Since Yocto now uses OpenSSL 3.0, the file packaging need to be updated. Signed-off-by: Petr Gotthard <petr.gotthard@advantech.cz> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb19
1 files changed, 13 insertions, 6 deletions
diff --git a/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb b/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb
index 4d1f425..efe62a8 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb
@@ -8,16 +8,23 @@ SECTION = "security/tpm"
8 8
9DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" 9DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl"
10 10
11SRCREV = "6f387a4efe2049f1b4833e8f621c77231bc1eef4" 11SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz"
12SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git;branch=v1.1.x;protocol=https" 12
13SRC_URI[sha256sum] = "ea2941695ac221d23a7f3e1321140e75b1495ae6ade876f2f4c2ed807c65e2a5"
13 14
14inherit autotools-brokensep pkgconfig systemd 15inherit autotools-brokensep pkgconfig systemd
15 16
16S = "${WORKDIR}/git" 17# It uses the API deprecated since the OpenSSL 3.0
18CFLAGS:append = ' -Wno-deprecated-declarations -Wno-unused-parameter'
19
20do_configure:prepend() {
21 # do not extract the version number from git
22 sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac
23}
17 24
18PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion" 25PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion"
19 26
20FILES:${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*" 27FILES:${PN}-dev = "${libdir}/engines-3/tpm2tss.so ${includedir}/*"
21FILES:${PN}-engines = "${libdir}/engines-1.1/lib*.so*" 28FILES:${PN}-engines = "${libdir}/engines-3/lib*.so*"
22FILES:${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a" 29FILES:${PN}-engines-staticdev = "${libdir}/engines-3/libtpm2tss.a"
23FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions" 30FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions"