Skip to contentSkip to conversation

tpm2-abrmd: startup fixes

PATCH In review Diego Santa Cruz 2 participants 4 messages Dec 6, 2019 – Dec 7, 2019

lore
Share & tools
lore
#0 lore raw

cover tpm2-abrmd: startup fixes

This ports patches from the meta-measured layer that fix tpm2-abrmd not starting up.
The first patch is necessary on kernels 4.12 and later. The second patch is necessary after the update to 2.3.0.

Philip Tricca (1):
tpm2-abrmd: Port command line options to new version.

Trevor Woerner (1):
tpm2-abrmd-init.sh: fix for /dev/tpmrmX

 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/2 tpm2-abrmd-init.sh: fix for /dev/tpmrmX

From: Trevor Woerner <[email protected]>

Newer kernels, in addition to the traditional /dev/tpmX device nodes, are now also creating /dev/tpmrmX device nodes. This causes this script to get confused and abort, meaning tpm2-abrmd does not get started during boot.

Fix for https://github.com/flihp/meta-measured/issues/56

---
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh +1 -1
index c8dfb7d..9bb7da9 100644
@@ -27,7 +27,7 @@ case "${1}" in
 	start)
 		echo -n "Starting $DESC: "
 
-		if [ ! -e /dev/tpm* ]
+		if [ ! -e /dev/tpm? ]
 		then
 			echo "device driver not loaded, skipping."
 			exit 0
Signature · 1 line
2.18.1
#2 lore raw

PATCH 2/2 tpm2-abrmd: Port command line options to new version.

In reply to Diego Santa Cruz

From: Philip Tricca <[email protected]>

These have changed upstream.

---
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default +1 -1
index 987978a..b4b3c20 100644
@@ -1 +1 @@
-DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
+DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20 --flush-all"
Signature · 1 line
2.18.1
#3 lore raw
In reply to Diego Santa Cruz

merged.
thanks,
Armin

Quoted 24 lines · Diego Santa Cruz via Lists.Yoctoproject.Org

This ports patches from the meta-measured layer that fix tpm2-abrmd not starting up.
The first patch is necessary on kernels 4.12 and later. The second patch is necessary after the update to 2.3.0.

Philip Tricca (1):
tpm2-abrmd: Port command line options to new version.

Trevor Woerner (1):
tpm2-abrmd-init.sh: fix for /dev/tpmrmX

 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#47581): https://lists.yoctoproject.org/g/yocto/message/47581
Mute This Topic: https://lists.yoctoproject.org/mt/67467010/1024635
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-