From a8fe5b174652d081898122acb8422d89de722f33 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 28 Nov 2018 20:46:44 +0800 Subject: [PATCH] release: fix install command The kata-shim Makefile is changed and we should not set libexecdir anymore. Fixes: #257 Signed-off-by: Peng Tao --- release/kata-deploy-binaries.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh index 1f5b858b1..1087f560b 100755 --- a/release/kata-deploy-binaries.sh +++ b/release/kata-deploy-binaries.sh @@ -124,20 +124,10 @@ install_kata_components() { make \ PREFIX="${prefix}" \ QEMUCMD="qemu-system-x86_64" - #TODO Remove libexecdir - libexecdir="libexec" - if [ "$p" == "shim" ]; then - libexecdir="/${destdir}/${prefix}/libexec/" - make PREFIX="${prefix}" \ - DESTDIR="${destdir}" \ - LIBEXECDIR="${libexecdir}" \ - install - else - echo "Install" - make PREFIX="${prefix}" \ - DESTDIR="${destdir}" \ - install - fi + echo "Install" + make PREFIX="${prefix}" \ + DESTDIR="${destdir}" \ + install popd >>/dev/null done sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration.toml"