diff options
| author | Bastian Krause <bst@pengutronix.de> | 2019-11-29 12:51:34 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-12-04 12:07:24 +0100 |
| commit | ba3bb9829fa87cf0ba0326a3d57c64857b9a9049 (patch) | |
| tree | 0ce9042829430e0dc051b0fb3de2015194a988a7 | |
| parent | 4de1fec88d62bfc9b27d5b1f3da51834f670ef7e (diff) | |
| download | ptxdist-ba3bb9829fa87cf0ba0326a3d57c64857b9a9049.tar.gz ptxdist-ba3bb9829fa87cf0ba0326a3d57c64857b9a9049.tar.xz | |
tpm2-abrmd: version bump 2.1.1 -> 2.3.0
Incorporate upstream changes of exit codes that prevent a restart loop
introduced by 036504e ("tabrmd-init: Give meaning to return values from tabrmd-init.")
Signed-off-by: Bastian Krause <bst@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | projectroot/usr/lib/systemd/system/tpm2-abrmd.service | 2 | ||||
| -rw-r--r-- | rules/tpm2-abrmd.make | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/projectroot/usr/lib/systemd/system/tpm2-abrmd.service b/projectroot/usr/lib/systemd/system/tpm2-abrmd.service index 204834738..5cccace95 100644 --- a/projectroot/usr/lib/systemd/system/tpm2-abrmd.service +++ b/projectroot/usr/lib/systemd/system/tpm2-abrmd.service @@ -5,6 +5,8 @@ ConditionPathExists=/dev/tpm0 [Service] Type=dbus Restart=always +# 69=EX_UNAVAILABLE, 71=EX_OSERR, 74=EX_IOERR +RestartPreventExitStatus=69 71 74 RestartSec=5 BusName=com.intel.tss2.Tabrmd StandardOutput=syslog diff --git a/rules/tpm2-abrmd.make b/rules/tpm2-abrmd.make index 24b1a0236..bbf334412 100644 --- a/rules/tpm2-abrmd.make +++ b/rules/tpm2-abrmd.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_ABRMD) += tpm2-abrmd # # Paths and names # -TPM2_ABRMD_VERSION := 2.1.1 -TPM2_ABRMD_MD5 := 47f9ee5be9cedec3a8f1a03f60ead4d5 +TPM2_ABRMD_VERSION := 2.3.0 +TPM2_ABRMD_MD5 := 1326e92638d4f55cc4553260e5c24b6c TPM2_ABRMD := tpm2-abrmd-$(TPM2_ABRMD_VERSION) TPM2_ABRMD_SUFFIX := tar.gz TPM2_ABRMD_URL := https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION)/$(TPM2_ABRMD).$(TPM2_ABRMD_SUFFIX) @@ -34,6 +34,7 @@ TPM2_ABRMD_LICENSE_FILES := file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da TPM2_ABRMD_CONF_TOOL := autoconf TPM2_ABRMD_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-debug=info \ --disable-unit \ --disable-code-coverage \ --disable-valgrind \ @@ -44,6 +45,7 @@ TPM2_ABRMD_CONF_OPT := \ --disable-dlclose \ --disable-test-hwtpm \ --disable-integration \ + --disable-defaultflags \ --without-gcov \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-dbuspolicydir=/usr/share/dbus-1/system.d |