From 03b522f859ac9f73eb054c4b3649464aace6960f Mon Sep 17 00:00:00 2001 From: Valentin Kunin Date: Tue, 21 May 2024 20:39:11 +0000 Subject: tpm2-tss: upgrade 4.0.1 -> 4.1.2 Bump tpm2-tss library version from 4.0.1 to 4.1.2. This simply involves renaming the recipe and chaning the target SHA256 library file hash. Also update the fixup_hosttools.patch to apply to the new version of the library. It stays the same functionally, but some line numbers needed to be updated to apply cleanly. Signed-off-by: Valentin Kunin Signed-off-by: Armin Kuster --- .../tpm2-tss/tpm2-tss/fixup_hosttools.patch | 25 ++++-- meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb | 97 ---------------------- meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.2.bb | 97 ++++++++++++++++++++++ 3 files changed, 115 insertions(+), 104 deletions(-) delete mode 100644 meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb create mode 100644 meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.2.bb diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch index 3f680ba..8822d1b 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch @@ -1,17 +1,26 @@ -revert configure: add checks for all tools used by make install +From ab120a9642516cdfdae5c5b8a91e42e2c9898172 Mon Sep 17 00:00:00 2001 +From: Valentin Kunin +Date: Mon, 20 May 2024 21:09:27 +0000 +Subject: [PATCH] revert configure: add checks for all tools used by make + install Not appropriate for cross build env. Upstream-Status: Inappropriate [OE specific] + Signed-off-by: Armin Kuster +Signed-off-by: Valentin Kunin +--- + configure.ac | 11 ----------- + 1 file changed, 11 deletions(-) -Index: tpm2-tss-4.0.1/configure.ac -=================================================================== ---- tpm2-tss-4.0.1.orig/configure.ac -+++ tpm2-tss-4.0.1/configure.ac -@@ -554,17 +554,6 @@ AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes") +diff --git a/configure.ac b/configure.ac +index eb6051ea..a52c4725 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -663,17 +663,6 @@ AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$s AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) - AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") + AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"]) -# Check all tools used by make install -AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"], @@ -27,3 +36,5 @@ Index: tpm2-tss-4.0.1/configure.ac AC_SUBST([PATH]) dnl --------- Doxy Gen ----------------------- +-- +2.45.0.rc1.225.g2a3ae87e7f-goog diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb deleted file mode 100644 index 334b638..0000000 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY = "Software stack for TPM2." -DESCRIPTION = "OSS implementation of the TCG TPM2 Software Stack (TSS2) " -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" -SECTION = "tpm" - -DEPENDS = "autoconf-archive-native libgcrypt openssl" - -SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ - file://fixup_hosttools.patch \ - " - -SRC_URI[sha256sum] = "532a70133910b6bd842289915b3f9423c0205c0ea009d65294ca18a74087c950" - -UPSTREAM_CHECK_URI = "https://github.com/tpm2-software/${BPN}/releases" - -CVE_PRODUCT = "tpm2_software_stack" - -inherit autotools pkgconfig systemd useradd - -PACKAGECONFIG ??= "" -PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " -PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c util-linux-libuuid " -PACKAGECONFIG[policy] = "--enable-policy,--disable-policy,json-c util-linux-libuuid " - -EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" -EXTRA_OECONF += "--runstatedir=/run" -EXTRA_OECONF:remove = " --disable-static" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system tss" -USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" - -do_install:append() { - # Remove /run as it is created on startup - rm -rf ${D}/run -} - -PROVIDES = "${PACKAGES}" -PACKAGES = " \ - ${PN} \ - ${PN}-dbg \ - ${PN}-doc \ - 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 \ -" - -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-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" - -FILES:libtss2 = "${libdir}/libtss2*so.*" -FILES:libtss2-dev = " \ - ${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/libtss2*so" -FILES:libtss2-staticdev = "${libdir}/libtss*a" - -FILES:${PN} = "\ - ${libdir}/udev \ - /var/lib/tpm2-tss \ - /var/run \ - ${nonarch_base_libdir}/udev \ - ${sysconfdir}/tmpfiles.d \ - ${sysconfdir}/tpm2-tss \ - ${sysconfdir}/sysusers.d" - -RDEPENDS:libtss2 = "libgcrypt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.2.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.2.bb new file mode 100644 index 0000000..9a57308 --- /dev/null +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.2.bb @@ -0,0 +1,97 @@ +SUMMARY = "Software stack for TPM2." +DESCRIPTION = "OSS implementation of the TCG TPM2 Software Stack (TSS2) " +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" +SECTION = "tpm" + +DEPENDS = "autoconf-archive-native libgcrypt openssl" + +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ + file://fixup_hosttools.patch \ + " + +SRC_URI[sha256sum] = "6ad3ef0993cf3bc953710abed847ff727ab427b5577e812e3ad3197bbcec069e" + +UPSTREAM_CHECK_URI = "https://github.com/tpm2-software/${BPN}/releases" + +CVE_PRODUCT = "tpm2_software_stack" + +inherit autotools pkgconfig systemd useradd + +PACKAGECONFIG ??= "" +PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " +PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c util-linux-libuuid " +PACKAGECONFIG[policy] = "--enable-policy,--disable-policy,json-c util-linux-libuuid " + +EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" +EXTRA_OECONF += "--runstatedir=/run" +EXTRA_OECONF:remove = " --disable-static" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system tss" +USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" + +do_install:append() { + # Remove /run as it is created on startup + rm -rf ${D}/run +} + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN} \ + ${PN}-dbg \ + ${PN}-doc \ + 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 \ +" + +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-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" + +FILES:libtss2 = "${libdir}/libtss2*so.*" +FILES:libtss2-dev = " \ + ${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libtss2*so" +FILES:libtss2-staticdev = "${libdir}/libtss*a" + +FILES:${PN} = "\ + ${libdir}/udev \ + /var/lib/tpm2-tss \ + /var/run \ + ${nonarch_base_libdir}/udev \ + ${sysconfdir}/tmpfiles.d \ + ${sysconfdir}/tpm2-tss \ + ${sysconfdir}/sysusers.d" + +RDEPENDS:libtss2 = "libgcrypt" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf