From 156cf9252806137c81cf2b006bc2f7de54517aca Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 12 Jun 2018 23:01:48 -0400 Subject: tpm2-tss: cleanup and update Cleanup the tpm2-tss recipe such that there is a recipe for building the latest release (the default) and one for building the latest, auto-incrementing version from git master placing all pieces common to the two recipes in an include file. Update release from 1.3.0 to 1.4.0. Signed-off-by: Trevor Woerner --- meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc | 12 ++ meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb | 55 +++++++++ meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb | 135 +++++++++++------------ 3 files changed, 131 insertions(+), 71 deletions(-) create mode 100644 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc create mode 100644 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc new file mode 100644 index 0000000..815bfec --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc @@ -0,0 +1,12 @@ +SUMMARY = "The TCG TPM2 Software Stack" +DESCRIPTION = "The TCG (Trusted Computing Group) Software Stack (TSS) \ +provides a standard API for accessing the functions of the TPM. \ +Application developers can use this software to develop interoperable \ +client applications." +HOMEPAGE = "https://github.com/tpm2-software/tpm2-tss" +SECTION = "security/tpm" +LICENSE = "BSD-2-Clause" + +DEPENDS = "autoconf-archive-native" + +inherit autotools pkgconfig diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb new file mode 100644 index 0000000..f676ba5 --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb @@ -0,0 +1,55 @@ +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" + +PROVIDES = "${PACKAGES}" + +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "3fadb8ee8a4e506b9732d2a9dfcad77c" +SRC_URI[sha256sum] = "cf8784cc536be16e6fba47f77033e093a6aeaed8420877ac9f42f77fb7b09031" + +S = "${WORKDIR}/${BPN}-${PV}" + +PACKAGES = " \ + ${PN}-dbg \ + ${PN}-doc \ + libtss2 \ + libtss2-dev \ + libtss2-staticdev \ + 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_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" + +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" diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb index 7147607..75825ff 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb @@ -1,82 +1,75 @@ -SUMMARY = "Software stack for TPM2." -DESCRIPTION = "tpm2-tss like woah." -SECTION = "security/tpm" +include ${BPN}.inc -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=0b1d631c4218b72f6b05cb58613606f4" -DEPENDS += "autoconf-archive pkgconfig" +DEFAULT_PREFERENCE = "-1" -PV = "1.3.0+git${SRCPV}" +DEPENDS += "libgcrypt" -SRC_URI = "\ - git://github.com/tpm2-software/tpm2-tss.git;branch=1.x \ -" -SRCREV = "b1d9ece8c6bea2e3043943b2edfaebcdca330c38" +PROVIDES = "${PACKAGES}" -S = "${WORKDIR}/git" +PVBASE := "${PV}" +PV = "${PVBASE}.${SRCPV}" -inherit autotools pkgconfig +SRC_URI = "git://github.com/tpm2-software/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN}" -do_configure_prepend() { - # execute the bootstrap script - currentdir="$(pwd)" - cd "${S}" - ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" \ - ./bootstrap - cd "${currentdir}" +SRCREV = "${AUTOREV}" + +S = "${WORKDIR}/${BPN}" + +do_configure_prepend () { + # Execute the bootstrap script, to generate src_vars.mk. + # The actual autotools bootstrapping is done by the normal + # do_configure, which does a better job with it (for example, + # it finds m4 macros also in the native sysroot). + currentdir=$(pwd) + cd ${S} + AUTORECONF=true ./bootstrap + cd ${currentdir} } -PACKAGES = "\ - ${PN}-dbg \ - libtss2 \ - libtss2-dev \ - libtss2-staticdev \ - libtss2-doc \ - libtctidevice \ - libtctidevice-dev \ - libtctidevice-staticdev \ - libtctisocket \ - libtctisocket-dev \ - libtctisocket-staticdev \ -" +PACKAGES = " \ + libtss2-mu \ + libtss2-mu-dev \ + libtss2-mu-staticdev \ + libtss2-tcti-device \ + libtss2-tcti-device-dev \ + libtss2-tcti-device-staticdev \ + libtss2-tcti-mssim \ + libtss2-tcti-mssim-dev \ + libtss2-tcti-mssim-staticdev \ + libtss2 \ + libtss2-dev \ + libtss2-staticdev \ + ${PN} \ + ${PN}-doc \ + ${PN}-dbg \ + " + +FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*" +FILES_libtss2-tcti-device-dev = " \ + ${includedir}/tss2/tss2_tcti_device.h \ + ${libdir}/pkgconfig/tss2-tcti-device.pc \ + ${libdir}/libtss2-tcti-device.so" +FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a" + +FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*" +FILES_libtss2-tcti-mssim-dev = " \ + ${includedir}/tss2/tss2_tcti_mssim.h \ + ${libdir}/pkgconfig/tss2-tcti-mssim.pc \ + ${libdir}/libtss2-tcti-mssim.so" +FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a" -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 \ -" +FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*" +FILES_libtss2-mu-dev = " \ + ${includedir}/tss2/tss2_mu.h \ + ${libdir}/pkgconfig/tss2-mu.pc \ + ${libdir}/libtss2-mu.so" +FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a" -RRECOMMENDS_${PN} += "\ - kernel-module-tpm-crb \ - kernel-module-tpm-tis \ -" +FILES_libtss2 = "${libdir}/libtss2*so.*" +FILES_libtss2-dev = " \ + ${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libtss2*so" +FILES_libtss2-staticdev = "${libdir}/libtss*a" -- cgit v1.2.3-54-g00ecf