summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2018-05-29 10:04:44 -0400
committerJia Zhang <zhang.jia@linux.alibaba.com>2018-05-30 09:38:05 +0800
commit4b2c94fb642c0e2c65878125b5fc8508f173e105 (patch)
treea046a8837458a07fa583c0d0929ab095c580c58f
parent18d65f89333b1a8482aab9183b143d18b44e9057 (diff)
downloadmeta-secure-core-4b2c94fb642c0e2c65878125b5fc8508f173e105.tar.gz
tpm2.0-tools: rename -> tpm2-tools
Unify how the TPM2 recipes are named. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r--meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb4
-rw-r--r--meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb2
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch (renamed from meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch)0
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb (renamed from meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb)2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
index e753112..a94ee5d 100644
--- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
+++ b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
@@ -66,7 +66,7 @@ FILES_${PN}-initramfs = "\
66# @grep: grep 66# @grep: grep
67# @procps: pkill, pgrep 67# @procps: pkill, pgrep
68# @cryptsetup: cryptsetup 68# @cryptsetup: cryptsetup
69# @tpm2.0-tools: tpm2_* 69# @tpm2-tools: tpm2_*
70# @tpm2-abrmd: optional 70# @tpm2-abrmd: optional
71RDEPENDS_${PN} += "\ 71RDEPENDS_${PN} += "\
72 libtss2 \ 72 libtss2 \
@@ -77,7 +77,7 @@ RDEPENDS_${PN} += "\
77 grep \ 77 grep \
78 procps \ 78 procps \
79 cryptsetup \ 79 cryptsetup \
80 tpm2.0-tools \ 80 tpm2-tools \
81" 81"
82 82
83# For init.cryptfs 83# For init.cryptfs
diff --git a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
index 96cddd3..eb096e0 100644
--- a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
+++ b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
@@ -2,7 +2,7 @@ require packagegroup-tpm2.inc
2 2
3RDEPENDS_${PN} += "\ 3RDEPENDS_${PN} += "\
4 tpm2-abrmd \ 4 tpm2-abrmd \
5 tpm2.0-tools \ 5 tpm2-tools \
6 rng-tools \ 6 rng-tools \
7" 7"
8 8
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch
index 0333089..0333089 100644
--- a/meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch
+++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb
index e832214..a8244de 100644
--- a/meta-tpm2/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
+++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb
@@ -1,5 +1,5 @@
1SUMMARY = "Tools for TPM2." 1SUMMARY = "Tools for TPM2."
2DESCRIPTION = "tpm2.0-tools" 2DESCRIPTION = "tpm2-tools"
3SECTION = "security/tpm" 3SECTION = "security/tpm"
4 4
5LICENSE = "BSD" 5LICENSE = "BSD"