From 6ca33b325d265afd2cab4890cd1379b2a95114f8 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 29 May 2018 12:21:25 -0400 Subject: tpm2.0-tss: rename -> tpm2-tss Unify how the TPM2 recipes are named. Signed-off-by: Trevor Woerner --- .../recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb | 2 +- meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb | 2 +- meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb | 2 +- meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb | 82 ++++++++++++++++++++++ meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 82 ---------------------- 5 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb delete mode 100644 meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb 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 a94ee5d..c966aa4 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 @@ -15,7 +15,7 @@ SECTION = "security/tpm" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=89c8ce1346a3dfe75379e84f3ba9d641" -DEPENDS += "tpm2.0-tss tpm2-abrmd pkgconfig-native" +DEPENDS += "tpm2-tss tpm2-abrmd pkgconfig-native" PV = "0.6.2+git${SRCPV}" diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb index 3a60863..da51776 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.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 pkgconfig tpm2.0-tss glib-2.0-native" +DEPENDS += "autoconf-archive dbus glib-2.0 pkgconfig tpm2-tss glib-2.0-native" PV = "1.2.0+git${SRCPV}" diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb index a8244de..b592882 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb @@ -5,7 +5,7 @@ SECTION = "security/tpm" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=91b7c548d73ea16537799e8060cea819" -DEPENDS += "tpm2.0-tss tpm2-abrmd openssl curl autoconf-archive pkgconfig" +DEPENDS += "tpm2-tss tpm2-abrmd openssl curl autoconf-archive pkgconfig" PV = "3.0.3+git${SRCPV}" diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb new file mode 100644 index 0000000..7147607 --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb @@ -0,0 +1,82 @@ +SUMMARY = "Software stack for TPM2." +DESCRIPTION = "tpm2-tss like woah." +SECTION = "security/tpm" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" + +DEPENDS += "autoconf-archive pkgconfig" + +PV = "1.3.0+git${SRCPV}" + +SRC_URI = "\ + git://github.com/tpm2-software/tpm2-tss.git;branch=1.x \ +" +SRCREV = "b1d9ece8c6bea2e3043943b2edfaebcdca330c38" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +do_configure_prepend() { + # execute the bootstrap script + currentdir="$(pwd)" + cd "${S}" + ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" \ + ./bootstrap + cd "${currentdir}" +} + +PACKAGES = "\ + ${PN}-dbg \ + libtss2 \ + libtss2-dev \ + libtss2-staticdev \ + libtss2-doc \ + libtctidevice \ + libtctidevice-dev \ + libtctidevice-staticdev \ + libtctisocket \ + libtctisocket-dev \ + libtctisocket-staticdev \ +" + +FILES_libtss2 = "${libdir}/libsapi.so.*" +FILES_libtss2-dev = "\ + ${includedir}/sapi \ + ${includedir}/tcti/common.h \ + ${libdir}/libsapi.so \ + ${libdir}/pkgconfig/sapi.pc \ +" +FILES_libtss2-staticdev = "\ + ${libdir}/libsapi.a \ + ${libdir}/libsapi.la \ +" +FILES_libtss2-doc = "\ + ${mandir} \ +" +FILES_libtctidevice = "${libdir}/libtcti-device.so.*" +FILES_libtctidevice-dev = "\ + ${includedir}/tcti/tcti_device.h \ + ${libdir}/libtcti-device.so \ + ${libdir}/pkgconfig/tcti-device.pc \ +" +FILES_libtctidevice-staticdev = "\ + ${libdir}/libtcti-device.a \ + ${libdir}/libtcti-device.la \ +" +FILES_libtctisocket = "${libdir}/libtcti-socket.so.*" +FILES_libtctisocket-dev = "\ + ${includedir}/tcti/tcti_socket.h \ + ${libdir}/libtcti-socket.so \ + ${libdir}/pkgconfig/tcti-socket.pc \ +" +FILES_libtctisocket-staticdev = "\ + ${libdir}/libtcti-socket.a \ + ${libdir}/libtcti-socket.la \ +" + +RRECOMMENDS_${PN} += "\ + kernel-module-tpm-crb \ + kernel-module-tpm-tis \ +" diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb deleted file mode 100644 index 37b2ab6..0000000 --- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "Software stack for TPM2." -DESCRIPTION = "tpm2.0-tss like woah." -SECTION = "security/tpm" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" - -DEPENDS += "autoconf-archive pkgconfig" - -PV = "1.3.0+git${SRCPV}" - -SRC_URI = "\ - git://github.com/tpm2-software/tpm2-tss.git;branch=1.x \ -" -SRCREV = "b1d9ece8c6bea2e3043943b2edfaebcdca330c38" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -do_configure_prepend() { - # execute the bootstrap script - currentdir="$(pwd)" - cd "${S}" - ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" \ - ./bootstrap - cd "${currentdir}" -} - -PACKAGES = "\ - ${PN}-dbg \ - libtss2 \ - libtss2-dev \ - libtss2-staticdev \ - libtss2-doc \ - libtctidevice \ - libtctidevice-dev \ - libtctidevice-staticdev \ - libtctisocket \ - libtctisocket-dev \ - libtctisocket-staticdev \ -" - -FILES_libtss2 = "${libdir}/libsapi.so.*" -FILES_libtss2-dev = "\ - ${includedir}/sapi \ - ${includedir}/tcti/common.h \ - ${libdir}/libsapi.so \ - ${libdir}/pkgconfig/sapi.pc \ -" -FILES_libtss2-staticdev = "\ - ${libdir}/libsapi.a \ - ${libdir}/libsapi.la \ -" -FILES_libtss2-doc = "\ - ${mandir} \ -" -FILES_libtctidevice = "${libdir}/libtcti-device.so.*" -FILES_libtctidevice-dev = "\ - ${includedir}/tcti/tcti_device.h \ - ${libdir}/libtcti-device.so \ - ${libdir}/pkgconfig/tcti-device.pc \ -" -FILES_libtctidevice-staticdev = "\ - ${libdir}/libtcti-device.a \ - ${libdir}/libtcti-device.la \ -" -FILES_libtctisocket = "${libdir}/libtcti-socket.so.*" -FILES_libtctisocket-dev = "\ - ${includedir}/tcti/tcti_socket.h \ - ${libdir}/libtcti-socket.so \ - ${libdir}/pkgconfig/tcti-socket.pc \ -" -FILES_libtctisocket-staticdev = "\ - ${libdir}/libtcti-socket.a \ - ${libdir}/libtcti-socket.la \ -" - -RRECOMMENDS_${PN} += "\ - kernel-module-tpm-crb \ - kernel-module-tpm-tis \ -" -- cgit v1.2.3-54-g00ecf