this aligns with the rest of the tpm2 recipes
[v2]
make changes in recipes
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb | 4 ++--
meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb | 2 +-
.../tpm2.0-tools_3.1.3.bb => tpm2-tools/tpm2-tools_3.1.3.bb} | 4 ++--
.../tpm2.0-tss => tpm2-tss/tpm2-tss}/ax_pthread.m4 | 0
.../tpm2-tss}/fix_musl_select_include.patch | 0
.../tpm2.0-tss_2.2.1.bb => tpm2-tss/tpm2-tss_2.2.1.bb} | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
rename meta-tpm/recipes-tpm2/{tpm2.0-tools/tpm2.0-tools_3.1.3.bb =>
tpm2-tools/tpm2-tools_3.1.3.bb} (77%)
rename meta-tpm/recipes-tpm2/{tpm2.0-tss/tpm2.0-tss =>
tpm2-tss/tpm2-tss}/ax_pthread.m4 (100%)
rename meta-tpm/recipes-tpm2/{tpm2.0-tss/tpm2.0-tss =>
tpm2-tss/tpm2-tss}/fix_musl_select_include.patch (100%)
rename meta-tpm/recipes-tpm2/{tpm2.0-tss/tpm2.0-tss_2.2.1.bb =>
tpm2-tss/tpm2-tss_2.2.1.bb} (98%)
diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
index 13dbf5a..a4c6682 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
@@ -9,7 +9,7 @@ SECTION = "security/tpm"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
-DEPENDS = "autoconf-archive dbus glib-2.0 tpm2.0-tss glib-2.0-native \
+DEPENDS = "autoconf-archive dbus glib-2.0 tpm2-tss glib-2.0-native \
libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim"
@@ -50,6 +50,6 @@ do_install_append() {
FILES_${PN} += "${libdir}/systemd/system-preset \
${datadir}/dbus-1"
-RDEPENDS_${PN} += "tpm2.0-tss"
+RDEPENDS_${PN} += "tpm2-tss"
BBCLASSEXTEND = "native"
diff --git a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb
b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb
index c24fd8f..9031e63 100644
--- a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb
@@ -4,7 +4,7 @@ SECTION = "security/tpm"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b748af41ef1300c98e105b3b7ec4ecc1"
-DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev
tpm2.0-tools"
+DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev
tpm2-tools"
SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git \
file://bootstrap_fixup.patch \
diff --git a/meta-tpm/recipes-tpm2/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
b/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.1.3.bb
similarity index 77%
rename from meta-tpm/recipes-tpm2/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
rename to meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.1.3.bb
index 56c68db..1f1f5c6 100644
--- a/meta-tpm/recipes-tpm2/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.1.3.bb
@@ -1,10 +1,10 @@
SUMMARY = "Tools for TPM2."
-DESCRIPTION = "tpm2.0-tools"
+DESCRIPTION = "tpm2-tools"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=91b7c548d73ea16537799e8060cea819"
SECTION = "tpm"
-DEPENDS = "pkgconfig tpm2.0-tss openssl curl autoconf-archive"
+DEPENDS = "pkgconfig tpm2-tss openssl curl autoconf-archive"
SRCREV = "74ba065e5914bc5d713ca3709d62a5751b097369"
diff --git a/meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4
similarity index 100%
rename from meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4
diff --git
a/meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch
similarity index 100%
rename from
meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch
diff --git a/meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.1.bb
similarity index 98%
rename from meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.1.bb
index 4f9db50..d9172e7 100644
--- a/meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.1.bb
@@ -1,5 +1,5 @@
SUMMARY = "Software stack for TPM2."
-DESCRIPTION = "tpm2.0-tss like woah."
+DESCRIPTION = "tpm2-tss like woah."
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
SECTION = "tpm"
--
2.17.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
