diff options
| author | Trevor Woerner <twoerner@gmail.com> | 2018-08-01 18:46:28 -0400 |
|---|---|---|
| committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2018-08-03 10:49:00 +0800 |
| commit | dc173c7a8dff4ac28ea0b075baa664aee5b92e6b (patch) | |
| tree | 1a388681511525258d4f532798a670a93ca2a9e2 | |
| parent | 5fa9c850bd0b1d4d4cd1ee5604cfe3052035f000 (diff) | |
| download | meta-secure-core-dc173c7a8dff4ac28ea0b075baa664aee5b92e6b.tar.gz | |
tpm2: update release recipes
tpm2-tss: 1.4.0 -> 2.0.0
tpm2-abrmd: 1.3.1 -> 2.0.1
tpm2-tools: 3.0.4 -> 3.1.1
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
15 files changed, 94 insertions, 232 deletions
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default index 987978a..08dd111 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default | |||
| @@ -1 +1 @@ | |||
| DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans" | DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default deleted file mode 100644 index 08dd111..0000000 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc index 037151e..804ee19 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc | |||
| @@ -7,10 +7,14 @@ SECTION = "security/tpm" | |||
| 7 | LICENSE = "BSD-2-Clause" | 7 | LICENSE = "BSD-2-Clause" |
| 8 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" | 8 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" |
| 9 | 9 | ||
| 10 | DEPENDS += "autoconf-archive-native dbus glib-2.0 glib-2.0-native" | 10 | DEPENDS += " \ |
| 11 | autoconf-archive-native dbus glib-2.0 glib-2.0-native \ | ||
| 12 | tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim \ | ||
| 13 | " | ||
| 11 | 14 | ||
| 12 | SRC_URI = "\ | 15 | SRC_URI = "\ |
| 13 | file://tpm2-abrmd-init.sh \ | 16 | file://tpm2-abrmd-init.sh \ |
| 17 | file://tpm2-abrmd.default \ | ||
| 14 | " | 18 | " |
| 15 | 19 | ||
| 16 | inherit autotools pkgconfig systemd update-rc.d useradd | 20 | inherit autotools pkgconfig systemd update-rc.d useradd |
| @@ -32,7 +36,17 @@ EXTRA_OECONF += "\ | |||
| 32 | --with-udevrulesdir=${sysconfdir}/udev/rules.d \ | 36 | --with-udevrulesdir=${sysconfdir}/udev/rules.d \ |
| 33 | " | 37 | " |
| 34 | 38 | ||
| 39 | do_install_append() { | ||
| 40 | install -d "${D}${sysconfdir}/init.d" | ||
| 41 | install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" | ||
| 42 | |||
| 43 | install -d "${D}${sysconfdir}/default" | ||
| 44 | install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd" | ||
| 45 | } | ||
| 46 | |||
| 35 | FILES_${PN} += "\ | 47 | FILES_${PN} += "\ |
| 36 | ${systemd_unitdir}/system-preset \ | 48 | ${systemd_unitdir}/system-preset \ |
| 37 | ${datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service \ | 49 | ${datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service \ |
| 38 | " | 50 | " |
| 51 | |||
| 52 | RDEPENDS_${PN} += "tpm2-tss" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb deleted file mode 100644 index 6cdf373..0000000 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | DEPENDS += "libtctidevice libtctisocket libtss2" | ||
| 4 | |||
| 5 | SRC_URI += " \ | ||
| 6 | https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ | ||
| 7 | file://tpm2-abrmd.default \ | ||
| 8 | " | ||
| 9 | SRC_URI[md5sum] = "3f5f2461fd98aca0add1187e4705c0de" | ||
| 10 | SRC_URI[sha256sum] = "859d777a0d2c5d78309c4a2f06879a1e914b41324ea8258920a778a1ad7e38ea" | ||
| 11 | |||
| 12 | do_install_append() { | ||
| 13 | install -d "${D}${sysconfdir}/init.d" | ||
| 14 | install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" | ||
| 15 | |||
| 16 | install -d "${D}${sysconfdir}/default" | ||
| 17 | install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd" | ||
| 18 | } | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.1.bb b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.1.bb new file mode 100644 index 0000000..8136a63 --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.1.bb | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | SRC_URI += " \ | ||
| 4 | https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ | ||
| 5 | file://tpm2-abrmd.default \ | ||
| 6 | " | ||
| 7 | SRC_URI[md5sum] = "533bb7b16e9335c32f67e80961542e19" | ||
| 8 | SRC_URI[sha256sum] = "b012a6c3e4462a411eaafd3dc8d3b13ef4118348acfd5108b68a57c8c0a5ed9c" | ||
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 ccb655a..1b115fb 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb | |||
| @@ -2,14 +2,11 @@ include ${BPN}.inc | |||
| 2 | 2 | ||
| 3 | DEFAULT_PREFERENCE = "-1" | 3 | DEFAULT_PREFERENCE = "-1" |
| 4 | 4 | ||
| 5 | DEPENDS += "tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim" | ||
| 6 | |||
| 7 | PVBASE := "${PV}" | 5 | PVBASE := "${PV}" |
| 8 | PV = "${PVBASE}.${SRCPV}" | 6 | PV = "${PVBASE}.${SRCPV}" |
| 9 | 7 | ||
| 10 | SRC_URI += " \ | 8 | SRC_URI += " \ |
| 11 | git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN} \ | 9 | git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN} \ |
| 12 | file://tpm2-abrmd_git.default \ | ||
| 13 | " | 10 | " |
| 14 | 11 | ||
| 15 | def version_git(d): | 12 | def version_git(d): |
| @@ -29,13 +26,3 @@ do_configure_prepend () { | |||
| 29 | AUTORECONF=true ./bootstrap | 26 | AUTORECONF=true ./bootstrap |
| 30 | cd "${currentdir}" | 27 | cd "${currentdir}" |
| 31 | } | 28 | } |
| 32 | |||
| 33 | do_install_append() { | ||
| 34 | install -d "${D}${sysconfdir}/init.d" | ||
| 35 | install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" | ||
| 36 | |||
| 37 | install -d "${D}${sysconfdir}/default" | ||
| 38 | install -m 0644 "${WORKDIR}/tpm2-abrmd_git.default" "${D}${sysconfdir}/default/tpm2-abrmd" | ||
| 39 | } | ||
| 40 | |||
| 41 | RDEPENDS_${PN} += "tpm2-tss" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools-3.0.4/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools-3.0.4/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch deleted file mode 100644 index b44d588..0000000 --- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools-3.0.4/0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | From cb1b28d795dd120dcc8b75fff926b0abcda06535 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jia Zhang <zhang.jia@linux.alibaba.com> | ||
| 3 | Date: Fri, 16 Feb 2018 20:31:58 -0500 | ||
| 4 | Subject: [PATCH] tpm2-tools: use dynamic linkage with tpm2-abrmd | ||
| 5 | |||
| 6 | tpm2-abrmd has huge dependencies and they are not necessary to be involved | ||
| 7 | in initramfs. | ||
| 8 | |||
| 9 | Signed-off-by: Jia Zhang <zhang.jia@linux.alibaba.com> | ||
| 10 | --- | ||
| 11 | Makefile.am | 2 +- | ||
| 12 | lib/tcti/tpm2_tools_tcti_abrmd.c | 21 +++++++++++++++++++-- | ||
| 13 | 2 files changed, 20 insertions(+), 3 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/Makefile.am b/Makefile.am | ||
| 16 | index 7ac86cd..1a8074a 100644 | ||
| 17 | --- a/Makefile.am | ||
| 18 | +++ b/Makefile.am | ||
| 19 | @@ -48,7 +48,7 @@ AM_LDFLAGS := $(EXTRA_LDFLAGS) $(CODE_COVERAGE_LIBS) | ||
| 20 | |||
| 21 | LDADD = \ | ||
| 22 | $(LIB_COMMON) $(SAPI_LIBS) $(TCTI_SOCK_LIBS) $(TCTI_TABRMD_LIBS) \ | ||
| 23 | - $(TCTI_DEV_LIBS) $(CRYPTO_LIBS) | ||
| 24 | + $(TCTI_DEV_LIBS) $(CRYPTO_LIBS) -ldl | ||
| 25 | |||
| 26 | # keep me sorted | ||
| 27 | bin_PROGRAMS = \ | ||
| 28 | diff --git a/lib/tcti/tpm2_tools_tcti_abrmd.c b/lib/tcti/tpm2_tools_tcti_abrmd.c | ||
| 29 | index 5e50288..48e0df6 100644 | ||
| 30 | --- a/lib/tcti/tpm2_tools_tcti_abrmd.c | ||
| 31 | +++ b/lib/tcti/tpm2_tools_tcti_abrmd.c | ||
| 32 | @@ -30,6 +30,7 @@ | ||
| 33 | //**********************************************************************; | ||
| 34 | #include <inttypes.h> | ||
| 35 | #include <stdlib.h> | ||
| 36 | +#include <dlfcn.h> | ||
| 37 | #include <tcti/tcti-tabrmd.h> | ||
| 38 | |||
| 39 | #include <sapi/tpm20.h> | ||
| 40 | @@ -42,8 +43,24 @@ TSS2_TCTI_CONTEXT *tpm2_tools_tcti_abrmd_init(char *opts) { | ||
| 41 | |||
| 42 | UNUSED(opts); | ||
| 43 | |||
| 44 | + /* | ||
| 45 | + * Intend to "forget" the handle in order to make sure libtcti-tabrmd | ||
| 46 | + * is unloaded along with the deconstructed functions. | ||
| 47 | + */ | ||
| 48 | + void *tabrmd_handle; | ||
| 49 | + tabrmd_handle = dlopen("libtcti-tabrmd.so.0", RTLD_LAZY); | ||
| 50 | + if (!tabrmd_handle) { | ||
| 51 | + LOG_ERR ("Unable to find out the tabrmd tcti library"); | ||
| 52 | + return NULL; | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + TSS2_RC (*init)(TSS2_TCTI_CONTEXT *, size_t *); | ||
| 56 | + init = dlsym(tabrmd_handle, "tss2_tcti_tabrmd_init"); | ||
| 57 | + if (!init) | ||
| 58 | + return NULL; | ||
| 59 | + | ||
| 60 | size_t size; | ||
| 61 | - TSS2_RC rc = tss2_tcti_tabrmd_init(NULL, &size); | ||
| 62 | + TSS2_RC rc = init(NULL, &size); | ||
| 63 | if (rc != TSS2_RC_SUCCESS) { | ||
| 64 | LOG_ERR("Failed to get size for TABRMD TCTI context: 0x%" PRIx32, rc); | ||
| 65 | return NULL; | ||
| 66 | @@ -55,7 +72,7 @@ TSS2_TCTI_CONTEXT *tpm2_tools_tcti_abrmd_init(char *opts) { | ||
| 67 | return NULL; | ||
| 68 | } | ||
| 69 | |||
| 70 | - rc = tss2_tcti_tabrmd_init(tcti_ctx, &size); | ||
| 71 | + rc = init(tcti_ctx, &size); | ||
| 72 | if (rc != TSS2_RC_SUCCESS) { | ||
| 73 | LOG_ERR ("Failed to initialize TABRMD TCTI context: 0x%" PRIx32, rc); | ||
| 74 | free(tcti_ctx); | ||
| 75 | -- | ||
| 76 | 1.8.3.1 | ||
| 77 | |||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools.inc b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools.inc index 8f74e85..cea48f8 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools.inc +++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools.inc | |||
| @@ -6,6 +6,9 @@ SECTION = "security/tpm" | |||
| 6 | LICENSE = "BSD" | 6 | LICENSE = "BSD" |
| 7 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=91b7c548d73ea16537799e8060cea819" | 7 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=91b7c548d73ea16537799e8060cea819" |
| 8 | 8 | ||
| 9 | DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive-native" | 9 | DEPENDS = " \ |
| 10 | tpm2-abrmd openssl curl autoconf-archive-native \ | ||
| 11 | tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim \ | ||
| 12 | " | ||
| 10 | 13 | ||
| 11 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.0.4.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.0.4.bb deleted file mode 100644 index d9851dc..0000000 --- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.0.4.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | SRC_URI = "\ | ||
| 4 | https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ | ||
| 5 | file://0001-tpm2-tools-use-dynamic-linkage-with-tpm2-abrmd.patch \ | ||
| 6 | " | ||
| 7 | SRC_URI[md5sum] = "f7a962c6e3d2997efe8949ac7aec8283" | ||
| 8 | SRC_URI[sha256sum] = "ac05028347a9fa1da79b5d53b998193de0c3a76000badb961c3feb8b8a0e8e8e" | ||
| 9 | |||
| 10 | S = "${WORKDIR}/${BPN}-${PV}" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.1.1.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.1.1.bb new file mode 100644 index 0000000..178ec15 --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.1.1.bb | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | SRC_URI = "\ | ||
| 4 | https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ | ||
| 5 | " | ||
| 6 | SRC_URI[md5sum] = "ad9e856c4cbd8a19eb205d74ab635adc" | ||
| 7 | SRC_URI[sha256sum] = "c7f0cdca51ef2006503f60c462b6d183c9b9dc038f4c3f74a89c111088fed8aa" | ||
| 8 | |||
| 9 | S = "${WORKDIR}/${BPN}-${PV}" | ||
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 7661623..c607b29 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb | |||
| @@ -2,8 +2,6 @@ include ${BPN}.inc | |||
| 2 | 2 | ||
| 3 | DEFAULT_PREFERENCE = "-1" | 3 | DEFAULT_PREFERENCE = "-1" |
| 4 | 4 | ||
| 5 | DEPENDS += "libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim" | ||
| 6 | |||
| 7 | PVBASE := "${PV}" | 5 | PVBASE := "${PV}" |
| 8 | PV = "${PVBASE}.${SRCPV}" | 6 | PV = "${PVBASE}.${SRCPV}" |
| 9 | 7 | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc index 815bfec..b03c152 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc | |||
| @@ -6,7 +6,56 @@ client applications." | |||
| 6 | HOMEPAGE = "https://github.com/tpm2-software/tpm2-tss" | 6 | HOMEPAGE = "https://github.com/tpm2-software/tpm2-tss" |
| 7 | SECTION = "security/tpm" | 7 | SECTION = "security/tpm" |
| 8 | LICENSE = "BSD-2-Clause" | 8 | LICENSE = "BSD-2-Clause" |
| 9 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=0b1d631c4218b72f6b05cb58613606f4" | ||
| 9 | 10 | ||
| 10 | DEPENDS = "autoconf-archive-native" | 11 | DEPENDS = "autoconf-archive-native libgcrypt" |
| 12 | |||
| 13 | PROVIDES = "${PACKAGES}" | ||
| 11 | 14 | ||
| 12 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
| 16 | |||
| 17 | PACKAGES = " \ | ||
| 18 | libtss2-mu \ | ||
| 19 | libtss2-mu-dev \ | ||
| 20 | libtss2-mu-staticdev \ | ||
| 21 | libtss2-tcti-device \ | ||
| 22 | libtss2-tcti-device-dev \ | ||
| 23 | libtss2-tcti-device-staticdev \ | ||
| 24 | libtss2-tcti-mssim \ | ||
| 25 | libtss2-tcti-mssim-dev \ | ||
| 26 | libtss2-tcti-mssim-staticdev \ | ||
| 27 | libtss2 \ | ||
| 28 | libtss2-dev \ | ||
| 29 | libtss2-staticdev \ | ||
| 30 | ${PN} \ | ||
| 31 | ${PN}-doc \ | ||
| 32 | ${PN}-dbg \ | ||
| 33 | " | ||
| 34 | |||
| 35 | FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*" | ||
| 36 | FILES_libtss2-tcti-device-dev = " \ | ||
| 37 | ${includedir}/tss2/tss2_tcti_device.h \ | ||
| 38 | ${libdir}/pkgconfig/tss2-tcti-device.pc \ | ||
| 39 | ${libdir}/libtss2-tcti-device.so" | ||
| 40 | FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a" | ||
| 41 | |||
| 42 | FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*" | ||
| 43 | FILES_libtss2-tcti-mssim-dev = " \ | ||
| 44 | ${includedir}/tss2/tss2_tcti_mssim.h \ | ||
| 45 | ${libdir}/pkgconfig/tss2-tcti-mssim.pc \ | ||
| 46 | ${libdir}/libtss2-tcti-mssim.so" | ||
| 47 | FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a" | ||
| 48 | |||
| 49 | FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*" | ||
| 50 | FILES_libtss2-mu-dev = " \ | ||
| 51 | ${includedir}/tss2/tss2_mu.h \ | ||
| 52 | ${libdir}/pkgconfig/tss2-mu.pc \ | ||
| 53 | ${libdir}/libtss2-mu.so" | ||
| 54 | FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a" | ||
| 55 | |||
| 56 | FILES_libtss2 = "${libdir}/libtss2*so.*" | ||
| 57 | FILES_libtss2-dev = " \ | ||
| 58 | ${includedir} \ | ||
| 59 | ${libdir}/pkgconfig \ | ||
| 60 | ${libdir}/libtss2*so" | ||
| 61 | FILES_libtss2-staticdev = "${libdir}/libtss*a" | ||
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 deleted file mode 100644 index f676ba5..0000000 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_1.4.0.bb +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" | ||
| 4 | |||
| 5 | PROVIDES = "${PACKAGES}" | ||
| 6 | |||
| 7 | SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" | ||
| 8 | SRC_URI[md5sum] = "3fadb8ee8a4e506b9732d2a9dfcad77c" | ||
| 9 | SRC_URI[sha256sum] = "cf8784cc536be16e6fba47f77033e093a6aeaed8420877ac9f42f77fb7b09031" | ||
| 10 | |||
| 11 | S = "${WORKDIR}/${BPN}-${PV}" | ||
| 12 | |||
| 13 | PACKAGES = " \ | ||
| 14 | ${PN}-dbg \ | ||
| 15 | ${PN}-doc \ | ||
| 16 | libtss2 \ | ||
| 17 | libtss2-dev \ | ||
| 18 | libtss2-staticdev \ | ||
| 19 | libtctidevice \ | ||
| 20 | libtctidevice-dev \ | ||
| 21 | libtctidevice-staticdev \ | ||
| 22 | libtctisocket \ | ||
| 23 | libtctisocket-dev \ | ||
| 24 | libtctisocket-staticdev \ | ||
| 25 | " | ||
| 26 | |||
| 27 | FILES_libtss2 = " \ | ||
| 28 | ${libdir}/libsapi.so.* \ | ||
| 29 | " | ||
| 30 | FILES_libtss2-dev = " \ | ||
| 31 | ${includedir}/sapi \ | ||
| 32 | ${includedir}/tcti/common.h \ | ||
| 33 | ${libdir}/libsapi.so \ | ||
| 34 | ${libdir}/pkgconfig/sapi.pc \ | ||
| 35 | " | ||
| 36 | FILES_libtss2-staticdev = " \ | ||
| 37 | ${libdir}/libsapi.a \ | ||
| 38 | ${libdir}/libsapi.la \ | ||
| 39 | " | ||
| 40 | |||
| 41 | FILES_libtctidevice = "${libdir}/libtcti-device.so.*" | ||
| 42 | FILES_libtctidevice-dev = " \ | ||
| 43 | ${includedir}/tcti/tcti_device.h \ | ||
| 44 | ${libdir}/libtcti-device.so \ | ||
| 45 | ${libdir}/pkgconfig/tcti-device.pc \ | ||
| 46 | " | ||
| 47 | FILES_libtctidevice-staticdev = "${libdir}/libtcti-device.*a" | ||
| 48 | |||
| 49 | FILES_libtctisocket = "${libdir}/libtcti-socket.so.*" | ||
| 50 | FILES_libtctisocket-dev = " \ | ||
| 51 | ${includedir}/tcti/tcti_socket.h \ | ||
| 52 | ${libdir}/libtcti-socket.so \ | ||
| 53 | ${libdir}/pkgconfig/tcti-socket.pc \ | ||
| 54 | " | ||
| 55 | FILES_libtctisocket-staticdev = "${libdir}/libtcti-socket.*a" | ||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb new file mode 100644 index 0000000..9fe3d6c --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | include ${BPN}.inc | ||
| 2 | |||
| 3 | SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" | ||
| 4 | SRC_URI[md5sum] = "048ea77be36f881b7b6ecefbc1cf7dbd" | ||
| 5 | SRC_URI[sha256sum] = "7dfd05f7d2c4d5339d1c9ecbdba25f4ea6df70e96b09928e15e0560cce02d525" | ||
| 6 | |||
| 7 | S = "${WORKDIR}/${BPN}-${PV}" | ||
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 75683a4..50a6749 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb | |||
| @@ -1,13 +1,7 @@ | |||
| 1 | include ${BPN}.inc | 1 | include ${BPN}.inc |
| 2 | 2 | ||
| 3 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=0b1d631c4218b72f6b05cb58613606f4" | ||
| 4 | |||
| 5 | DEFAULT_PREFERENCE = "-1" | 3 | DEFAULT_PREFERENCE = "-1" |
| 6 | 4 | ||
| 7 | DEPENDS += "libgcrypt" | ||
| 8 | |||
| 9 | PROVIDES = "${PACKAGES}" | ||
| 10 | |||
| 11 | PVBASE := "${PV}" | 5 | PVBASE := "${PV}" |
| 12 | PV = "${PVBASE}.${SRCPV}" | 6 | PV = "${PVBASE}.${SRCPV}" |
| 13 | 7 | ||
| @@ -33,49 +27,3 @@ do_configure_prepend () { | |||
| 33 | AUTORECONF=true ./bootstrap | 27 | AUTORECONF=true ./bootstrap |
| 34 | cd "${currentdir}" | 28 | cd "${currentdir}" |
| 35 | } | 29 | } |
| 36 | |||
| 37 | PACKAGES = " \ | ||
| 38 | libtss2-mu \ | ||
| 39 | libtss2-mu-dev \ | ||
| 40 | libtss2-mu-staticdev \ | ||
| 41 | libtss2-tcti-device \ | ||
| 42 | libtss2-tcti-device-dev \ | ||
| 43 | libtss2-tcti-device-staticdev \ | ||
| 44 | libtss2-tcti-mssim \ | ||
| 45 | libtss2-tcti-mssim-dev \ | ||
| 46 | libtss2-tcti-mssim-staticdev \ | ||
| 47 | libtss2 \ | ||
| 48 | libtss2-dev \ | ||
| 49 | libtss2-staticdev \ | ||
| 50 | ${PN} \ | ||
| 51 | ${PN}-doc \ | ||
| 52 | ${PN}-dbg \ | ||
| 53 | " | ||
| 54 | |||
| 55 | FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*" | ||
| 56 | FILES_libtss2-tcti-device-dev = " \ | ||
| 57 | ${includedir}/tss2/tss2_tcti_device.h \ | ||
| 58 | ${libdir}/pkgconfig/tss2-tcti-device.pc \ | ||
| 59 | ${libdir}/libtss2-tcti-device.so" | ||
| 60 | FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a" | ||
| 61 | |||
| 62 | FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*" | ||
| 63 | FILES_libtss2-tcti-mssim-dev = " \ | ||
| 64 | ${includedir}/tss2/tss2_tcti_mssim.h \ | ||
| 65 | ${libdir}/pkgconfig/tss2-tcti-mssim.pc \ | ||
| 66 | ${libdir}/libtss2-tcti-mssim.so" | ||
| 67 | FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a" | ||
| 68 | |||
| 69 | FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*" | ||
| 70 | FILES_libtss2-mu-dev = " \ | ||
| 71 | ${includedir}/tss2/tss2_mu.h \ | ||
| 72 | ${libdir}/pkgconfig/tss2-mu.pc \ | ||
| 73 | ${libdir}/libtss2-mu.so" | ||
| 74 | FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a" | ||
| 75 | |||
| 76 | FILES_libtss2 = "${libdir}/libtss2*so.*" | ||
| 77 | FILES_libtss2-dev = " \ | ||
| 78 | ${includedir} \ | ||
| 79 | ${libdir}/pkgconfig \ | ||
| 80 | ${libdir}/libtss2*so" | ||
| 81 | FILES_libtss2-staticdev = "${libdir}/libtss*a" | ||
