diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2020-01-08 03:13:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 03:13:35 +0300 |
| commit | d4be936ca1a6668ceb9ce019440b676381158f48 (patch) | |
| tree | 99cd46b66d5b9b97d38265d553f4fb60fee0d6a2 /meta-security/meta-tpm | |
| parent | e0a95aa4bacb4a023254e673d2cb9b0cc3c1a64f (diff) | |
| parent | 820013481a115100d5f8f22dc01aac8cc0363a23 (diff) | |
| download | openbmc-d4be936ca1a6668ceb9ce019440b676381158f48.tar.xz | |
Merge pull request #29 from Intel-BMC/update
Update
Diffstat (limited to 'meta-security/meta-tpm')
3 files changed, 3 insertions, 2 deletions
diff --git a/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf index 3af2d9517..175eba84e 100644 --- a/meta-security/meta-tpm/conf/layer.conf +++ b/meta-security/meta-tpm/conf/layer.conf @@ -14,3 +14,4 @@ LAYERDEPENDS_tpm-layer = " \ core \ openembedded-layer \ " +BBLAYERS_LAYERINDEX_NAME_tpm-layer = "meta-tpm" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh index c8dfb7de3..9bb7da972 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh @@ -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 diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default index 987978a66..b4b3c2072 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default @@ -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" |