From de08228a0de497e9efd848470309bd5d76e691d7 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 12 Jun 2018 23:11:10 -0400 Subject: tpm2-abrmd: update daemon cmdline options In the latest git version of abrmd: - the following option has been renamed: --max-transient-objects -> --max-transients - the following option has been removed: --fail-on-loaded-trans Signed-off-by: Trevor Woerner --- .../recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default | 1 + meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc | 9 --------- meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb | 13 ++++++++++++- meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb | 13 ++++++++++++- 4 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default 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 new file mode 100644 index 0000000..08dd111 --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default @@ -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 2cadb64..a71a04b 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc @@ -11,7 +11,6 @@ DEPENDS += "autoconf-archive-native dbus glib-2.0 glib-2.0-native" SRC_URI = "\ file://tpm2-abrmd-init.sh \ - file://tpm2-abrmd.default \ " inherit autotools pkgconfig systemd update-rc.d useradd @@ -27,14 +26,6 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "tss" USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" -do_install_append() { - install -d "${D}${sysconfdir}/init.d" - install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" - - install -d "${D}${sysconfdir}/default" - install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd" -} - FILES_${PN} += "\ ${libdir}/systemd \ ${datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service \ 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 index ce1459c..32d842d 100644 --- 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 @@ -2,6 +2,17 @@ include ${BPN}.inc DEPENDS += "libtctidevice libtctisocket libtss2" -SRC_URI += "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" +SRC_URI += " \ + https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ + file://tpm2-abrmd.default \ + " SRC_URI[md5sum] = "3f5f2461fd98aca0add1187e4705c0de" SRC_URI[sha256sum] = "859d777a0d2c5d78309c4a2f06879a1e914b41324ea8258920a778a1ad7e38ea" + +do_install_append() { + install -d "${D}${sysconfdir}/init.d" + install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" + + install -d "${D}${sysconfdir}/default" + install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd" +} 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 43f2650..a18a62c 100644 --- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb +++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb @@ -7,7 +7,10 @@ DEPENDS += "tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim" PVBASE := "${PV}" PV = "${PVBASE}.${SRCPV}" -SRC_URI += "git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN}" +SRC_URI += " \ + git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN} \ + file://tpm2-abrmd_git.default \ + " SRCREV = "${AUTOREV}" @@ -21,4 +24,12 @@ do_configure_prepend () { cd ${currentdir} } +do_install_append() { + install -d "${D}${sysconfdir}/init.d" + install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" + + install -d "${D}${sysconfdir}/default" + install -m 0644 "${WORKDIR}/tpm2-abrmd_git.default" "${D}${sysconfdir}/default/tpm2-abrmd" +} + RDEPENDS_${PN} += "tpm2-tss" -- cgit v1.2.3-54-g00ecf