diff options
| author | Jonathan Bauer | 2018-11-12 16:30:42 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2018-11-12 17:30:33 +0100 |
| commit | 1430bb0e912c0824e2911e656cf6232626435775 (patch) | |
| tree | b5211031ffb71714ae03dbb8528ba0bda703a5c8 | |
| parent | wip (diff) | |
| download | systemd-init-1430bb0e912c0824e2911e656cf6232626435775.tar.gz systemd-init-1430bb0e912c0824e2911e656cf6232626435775.tar.xz systemd-init-1430bb0e912c0824e2911e656cf6232626435775.zip | |
functioning draft
| -rwxr-xr-x | builder/modules.d/slx-tpm/module-setup.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builder/modules.d/slx-tpm/module-setup.sh b/builder/modules.d/slx-tpm/module-setup.sh index 8185c2f3..3c15eb7d 100755 --- a/builder/modules.d/slx-tpm/module-setup.sh +++ b/builder/modules.d/slx-tpm/module-setup.sh @@ -65,7 +65,9 @@ install_ibm_tss() { mkdir -p "$1/usr/local/bin" # this is hacky, TODO better with /etc/ld.cache.conf.d ? cp *.so* "$1/usr/lib" + mkdir -p "$1/usr/local/"{bin,include} find . -perm /a+x -type f -exec cp {} "$1/usr/local/bin/" \; + # only needed to compile some tpm binary (not needed in initramfs) tar cvf - tss2 | tar xvf - -C "$1/usr/local/include" cd - } @@ -76,15 +78,14 @@ install_openssl_tpm2_engine() { fi cd "$moddir/build/${openssl_tpm2_engine_target}" make DESTDIR="$initdir" install + mkdir -p "$initdir/usr/lib/x86_64-linux-gnu/" + cp -r /usr/lib/x86_64-linux-gnu/engines-1.1 "$initdir/usr/lib/x86_64-linux-gnu/" + ln -s "libtpm2.so" "$initdir/usr/lib/x86_64-linux-gnu/engines-1.1/tpm2.so" } install() { - if [ ! -d "$moddir/build/${openssl_tpm2_engine_target}" ]; then - install_openssl_tpm2_engine || return 1 - fi + install_openssl_tpm2_engine install_ibm_tss "$initdir" inst_multiple openssl - mkdir -p "$initdir/usr/lib/x86_64-linux-gnu/" - cp -r /usr/lib/x86_64-linux-gnu/engines-1.1 "$initdir/usr/lib/x86_64-linux-gnu/engines-1.1" return 0 } installkernel() { |