tpm2-abrmd: update to 2.0.2
PATCH 1/3 tpm2-abrmd: update to 2.0.2
Signed-off-by Armin Kuster <[email protected]>
---
.../tpm2-abrmd/{tpm2-abrmd_2.0.1.bb => tpm2-abrmd_2.0.2.bb} | 9 ++++-----
.../{tpm2simulator-native_138.bb => tpm2simulator_138.bb} | 0
2 files changed, 4 insertions(+), 5 deletions(-)
rename meta-tpm/recipes-tpm/tpm2-abrmd/{tpm2-abrmd_2.0.1.bb => tpm2-abrmd_2.0.2.bb} (86%)
rename meta-tpm/recipes-tpm/tpm2simulator/{tpm2simulator-native_138.bb => tpm2simulator_138.bb} (100%)meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb renamed from meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.1.bb +4 -5
@@ -9,15 +9,16 @@ 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 tpm2.0-tss glib-2.0-native \ libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim" + SRC_URI = "\ git://github.com/01org/tpm2-abrmd.git \ file://tpm2-abrmd-init.sh \ file://tpm2-abrmd.default \ " -SRCREV = "80f8966b90d6394ad568e362d2936b333c2822bb" +SRCREV = "d0120ace58d97bc9520c0d558657eaca87ae73b1" S = "${WORKDIR}/git"
@@ -34,9 +35,7 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "tss" USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" -PACKAGECONFIG ?="udev" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" - +PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" do_install_append() {
meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb renamed from meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_138.bb +0 -0
Signature · 1 line
2.7.4
PATCH 2/3 packagegroup-security-tpm2: add and remove packages
Signed-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb +2 -2
@@ -1,4 +1,4 @@ -DESCRIPTION = "Security packagegroup for Poky" +DESCRIPTION = "TPM2 packagegroup for Security" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -14,5 +14,5 @@ RDEPENDS_packagegroup-security-tpm2 = " \ libtss2 \ libtss2-tcti-device \ libtss2-tcti-mssim \ - resourcemgr \ + tpm2-abrmd \ "
Signature · 1 line
2.7.4
PATCH 3/3 swtpm: switch to stable branch and clean up recipe
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb +5 -17
@@ -3,22 +3,21 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8" SECTION = "apps" -DEPENDS = "libtasn1 expect socat glib-2.0 libtpm libtpm-native" +DEPENDS = "libtasn1 expect socat glib-2.0 net-tools-native libtpm libtpm-native" # configure checks for the tools already during compilation and # then swtpm_setup needs them at runtime DEPENDS += "tpm-tools-native expect-native socat-native" -SRCREV = "66b42f52ef363998cb57f039889d59381d20bdf1" -SRC_URI = "git://github.com/stefanberger/swtpm.git \ - file://fix_lib_search_path.patch \ +SRCREV = "94bb9f2d716d09bcc6cd2a2e033018f8592008e7" +SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=tpm2-preview.v2 \ file://fix_fcntl_h.patch \ file://ioctl_h.patch \ " S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig +inherit autotools pkgconfig PARALLEL_MAKE = "" TSS_USER="tss"
@@ -35,21 +34,12 @@ EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}" export SEARCH_DIR = "${STAGING_LIBDIR_NATIVE}" -# dup bootstrap -do_configure_prepend () { - libtoolize --force --copy - autoheader - aclocal - automake --add-missing -c - autoconf -} - 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}" -RDEPENDS_${PN} = "libtpm expect socat bash" +RDEPENDS_${PN} = "libtpm expect socat bash tpm-tools" BBCLASSEXTEND = "native nativesdk"
@@ -58,5 +48,3 @@ python() { 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Cuse enabled which requires meta-filesystems to be present.') } - -RDEPENDS_${PN} += "tpm-tools"
Signature · 1 line
2.7.4