summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Mueller-Klieser <S.Mueller-Klieser@phytec.de>2021-11-04 12:16:15 +0100
committerArmin Kuster <akuster808@gmail.com>2021-11-07 11:26:49 -0800
commit696651d0c32258b789ab768bb506bc0a1fdc9a31 (patch)
tree11d2dfecff18e855ac2885de5b68e646c91eaffa
parent7e27eb5fca7a22e82251f79103bb12d2b70307fb (diff)
downloadmeta-security-696651d0c32258b789ab768bb506bc0a1fdc9a31.tar.gz
tpm2-tss: fix fapi package config
When enabling fapi, the build breaks with: | configure: error: Package requirements (libcurl) were not met: | No package 'libcurl' found This adds the missing dependency and bundles the additional config files in the base package. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb
index 6470879..1a36a5b 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb
@@ -15,7 +15,7 @@ inherit autotools pkgconfig systemd extrausers
15 15
16PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
17PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " 17PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, "
18PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,json-c " 18PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c "
19 19
20EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" 20EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/"
21EXTRA_OECONF:remove = " --disable-static" 21EXTRA_OECONF:remove = " --disable-static"
@@ -73,6 +73,11 @@ FILES:libtss2-dev = " \
73 ${libdir}/libtss2*so" 73 ${libdir}/libtss2*so"
74FILES:libtss2-staticdev = "${libdir}/libtss*a" 74FILES:libtss2-staticdev = "${libdir}/libtss*a"
75 75
76FILES:${PN} = "${libdir}/udev ${nonarch_base_libdir}/udev" 76FILES:${PN} = "\
77 ${libdir}/udev \
78 ${nonarch_base_libdir}/udev \
79 ${sysconfdir}/tmpfiles.d \
80 ${sysconfdir}/tpm2-tss \
81 ${sysconfdir}/sysusers.d"
77 82
78RDEPENDS:libtss2 = "libgcrypt" 83RDEPENDS:libtss2 = "libgcrypt"