From 9c43b073a2fc2f8e36005e2b84089728d8ea45d0 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 30 Apr 2024 12:35:51 -0700 Subject: swtpm: upgrade 0.8.1 -> 0.8.2 version 0.8.2: - swtpm: - cuse: Lock file_ops_lock before reading tpm_running - build-sys: - Add support for --disable-tests to disable tests https://github.com/stefanberger/swtpm/compare/v0.8.1...v0.8.2 Signed-off-by: Tim Orling Signed-off-by: Armin Kuster --- meta-tpm/recipes-tpm/swtpm/swtpm_0.8.1.bb | 49 ------------------------------- meta-tpm/recipes-tpm/swtpm/swtpm_0.8.2.bb | 49 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 meta-tpm/recipes-tpm/swtpm/swtpm_0.8.1.bb create mode 100644 meta-tpm/recipes-tpm/swtpm/swtpm_0.8.2.bb diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.1.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.1.bb deleted file mode 100644 index 7a538da..0000000 --- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.1.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "SWTPM - Software TPM Emulator" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8" -SECTION = "apps" - -# expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests -DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib" - -SRCREV = "d2849a9f5ced70438d67036693438344b47b4161" -SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.8;protocol=https" -PE = "1" - -S = "${WORKDIR}/git" - -PARALLEL_MAKE = "" -inherit autotools pkgconfig perlnative - -TSS_USER="tss" -TSS_GROUP="tss" - -PACKAGECONFIG ?= "openssl gnutls" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', 'cuse', '', d)}" -PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" -# expect, bash, tpm2-pkcs11-tools (tpm2_ptool), tpmtool and certtool is -# used by swtpm-create-tpmca (the last two is provided by gnutls) -# gnutls is required by: swtpm-create-tpmca, swtpm-localca and swtpm_cert -PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls-native gnutls, gnutls-bin expect bash tpm2-pkcs11-tools" -PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" -PACKAGECONFIG[cuse] = "--with-cuse, --without-cuse, fuse" -PACKAGECONFIG[seccomp] = "--with-seccomp, --without-seccomp, libseccomp" - -EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system ${TSS_USER}" -USERADD_PARAM:${PN} = "--system -g ${TSS_GROUP} --home-dir / \ - --no-create-home --shell /bin/false ${BPN}" - - -PACKAGE_BEFORE_PN = "${PN}-cuse" -FILES:${PN}-cuse = "${bindir}/swtpm_cuse" - -INSANE_SKIP:${PN} += "dev-so" - -RDEPENDS:${PN} = "libtpm" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.2.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.2.bb new file mode 100644 index 0000000..b987f59 --- /dev/null +++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.2.bb @@ -0,0 +1,49 @@ +SUMMARY = "SWTPM - Software TPM Emulator" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8" +SECTION = "apps" + +# expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests +DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib" + +SRCREV = "507d14219dde88eb3eb2d10d15872d4044aa9d3e" +SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.8;protocol=https" +PE = "1" + +S = "${WORKDIR}/git" + +PARALLEL_MAKE = "" +inherit autotools pkgconfig perlnative + +TSS_USER="tss" +TSS_GROUP="tss" + +PACKAGECONFIG ?= "openssl gnutls" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', 'cuse', '', d)}" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" +# expect, bash, tpm2-pkcs11-tools (tpm2_ptool), tpmtool and certtool is +# used by swtpm-create-tpmca (the last two is provided by gnutls) +# gnutls is required by: swtpm-create-tpmca, swtpm-localca and swtpm_cert +PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls-native gnutls, gnutls-bin expect bash tpm2-pkcs11-tools" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" +PACKAGECONFIG[cuse] = "--with-cuse, --without-cuse, fuse" +PACKAGECONFIG[seccomp] = "--with-seccomp, --without-seccomp, libseccomp" + +EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system ${TSS_USER}" +USERADD_PARAM:${PN} = "--system -g ${TSS_GROUP} --home-dir / \ + --no-create-home --shell /bin/false ${BPN}" + + +PACKAGE_BEFORE_PN = "${PN}-cuse" +FILES:${PN}-cuse = "${bindir}/swtpm_cuse" + +INSANE_SKIP:${PN} += "dev-so" + +RDEPENDS:${PN} = "libtpm" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf