From 68f959b95d24a6f61aff9bc2e2bbfbadf2820736 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Fri, 20 Dec 2024 16:04:30 +0200 Subject: libtpm: rename to libtpms Upstream and other distros like Debian use package name libtpms so use this name for recipe too to match CVEs etc. Signed-off-by: Mikko Rapeli Signed-off-by: Armin Kuster --- meta-tpm/conf/distro/include/maintainers-meta-tpm.inc | 2 +- .../packagegroup/packagegroup-security-vtpm.bb | 2 +- meta-tpm/recipes-tpm/libtpm/libtpm_0.10.0.bb | 16 ---------------- meta-tpm/recipes-tpm/libtpm/libtpms_0.10.0.bb | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta-tpm/recipes-tpm/libtpm/libtpm_0.10.0.bb create mode 100644 meta-tpm/recipes-tpm/libtpm/libtpms_0.10.0.bb diff --git a/meta-tpm/conf/distro/include/maintainers-meta-tpm.inc b/meta-tpm/conf/distro/include/maintainers-meta-tpm.inc index e7b216d..77f843d 100644 --- a/meta-tpm/conf/distro/include/maintainers-meta-tpm.inc +++ b/meta-tpm/conf/distro/include/maintainers-meta-tpm.inc @@ -22,7 +22,7 @@ RECIPE_MAINTAINER:pn-aircrack-ng = "Armin Kuster " RECIPE_MAINTAINER:pn-pcr-extend = "Armin Kuster " RECIPE_MAINTAINER:pn-tpm-quote-tools = "Armin Kuster " -RECIPE_MAINTAINER:pn-libtpm = "Armin Kuster " +RECIPE_MAINTAINER:pn-libtpms = "Armin Kuster " RECIPE_MAINTAINER:pn-trousers = "Armin Kuster " RECIPE_MAINTAINER:pn-swtpm = "Armin Kuster " RECIPE_MAINTAINER:pn-openssl-tpm-engine = "Armin Kuster " diff --git a/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb b/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb index 3a8f2fa..3c67630 100644 --- a/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb +++ b/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb @@ -9,6 +9,6 @@ PACKAGES = "packagegroup-security-vtpm" SUMMARY:packagegroup-security-vtpm = "Security Software vTPM support" RDEPENDS:packagegroup-security-vtpm = " \ - libtpm \ + libtpms \ swtpm \ " diff --git a/meta-tpm/recipes-tpm/libtpm/libtpm_0.10.0.bb b/meta-tpm/recipes-tpm/libtpm/libtpm_0.10.0.bb deleted file mode 100644 index a2c3a14..0000000 --- a/meta-tpm/recipes-tpm/libtpm/libtpm_0.10.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "LIBPM - Software TPM Library" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e73f0786a936da3814896df06ad225a9" - -SRCREV = "17f253a767f6b5b7813ae33f12bc79c479576cdc" -SRC_URI = "git://github.com/stefanberger/libtpms.git;branch=stable-0.10;protocol=https" - -PE = "2" - -S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig perlnative - -PACKAGECONFIG ?= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-tpm/recipes-tpm/libtpm/libtpms_0.10.0.bb b/meta-tpm/recipes-tpm/libtpm/libtpms_0.10.0.bb new file mode 100644 index 0000000..a2c3a14 --- /dev/null +++ b/meta-tpm/recipes-tpm/libtpm/libtpms_0.10.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "LIBPM - Software TPM Library" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e73f0786a936da3814896df06ad225a9" + +SRCREV = "17f253a767f6b5b7813ae33f12bc79c479576cdc" +SRC_URI = "git://github.com/stefanberger/libtpms.git;branch=stable-0.10;protocol=https" + +PE = "2" + +S = "${WORKDIR}/git" +inherit autotools-brokensep pkgconfig perlnative + +PACKAGECONFIG ?= "openssl" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf