summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-11-12 16:47:34 +0100
committerJonathan Bauer2018-11-12 17:30:33 +0100
commitc991c5c32f38e4bb04c64acb925b71b47416ad20 (patch)
tree69bdc5dd46d2d46bc6464568c5bc52de05ae6a24
parentfunctioning draft (diff)
downloadsystemd-init-c991c5c32f38e4bb04c64acb925b71b47416ad20.tar.gz
systemd-init-c991c5c32f38e4bb04c64acb925b71b47416ad20.tar.xz
systemd-init-c991c5c32f38e4bb04c64acb925b71b47416ad20.zip
[slx-tpm] improve configure arguments
-rwxr-xr-xbuilder/modules.d/slx-tpm/module-setup.sh6
1 files 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() {