From c991c5c32f38e4bb04c64acb925b71b47416ad20 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 12 Nov 2018 16:47:34 +0100 Subject: [slx-tpm] improve configure arguments --- builder/modules.d/slx-tpm/module-setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/modules.d/slx-tpm/module-setup.sh b/builder/modules.d/slx-tpm/module-setup.sh index 3c15eb7d..a74faa3c 100755 --- a/builder/modules.d/slx-tpm/module-setup.sh +++ b/builder/modules.d/slx-tpm/module-setup.sh @@ -47,7 +47,7 @@ compile_openssl_tpm2_engine() { tar xvf "$openssl_tpm2_engine_target.tar.gz" -C "$moddir/build" cd "$moddir/build/$openssl_tpm2_engine_target" bash bootstrap.sh - CFLAGS="-I. -Wno-pointer-sign" ./configure + CFLAGS="-I$moddir/build/${ibm_tss_target%%.*}/utils -Wno-pointer-sign" ./configure # cause help2man suck... sed -i '/^HELP2MAN/ s/$/ --no-discard-stderr/' Makefile make @@ -65,10 +65,10 @@ 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} + mkdir -p "$1/usr/local/bin" 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" +# tar cvf - tss2 | tar xvf - -C "$1/usr/local/include" cd - } install_openssl_tpm2_engine() { -- cgit v1.2.3-55-g7522