From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Bastian Krause Date: Fri, 29 Nov 2019 12:51:34 +0100 Message-Id: <20191129115134.6402-3-bst@pengutronix.de> In-Reply-To: <20191129115134.6402-1-bst@pengutronix.de> References: <20191129115134.6402-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v3 3/3] tpm2-abrmd: version bump 2.1.1 -> 2.3.0 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bastian Krause 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 --- Added in v3, because tpm2-abrmd 2.1.1 and tpm2-tss 2.3.1 are incompatible. --- projectroot/usr/lib/systemd/system/tpm2-abrmd.service | 2 ++ 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 -- 2.24.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de