github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-18 23:39:30 +00:00
Code Issues Projects Releases Wiki Activity

release: only set LIBEXECDIR for kata-shim

Browse Source 
It is the only repo that requires LIBEXECDIR. Do not set it
for other repos, otherwise the runtime repo will mistakenly install
kata-netmon in a wrong path.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao
2018-09-29 10:06:51 +08:00
parent 4672721efa
commit 71c693ccac
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
release/kata-deploy-binaries.sh
View File

@@ -128,12 +128,16 @@ install_kata_components() {
libexecdir="libexec" libexecdir="libexec"
if [ "$p" == "shim" ]; then if [ "$p" == "shim" ]; then
libexecdir="/${destdir}/${prefix}/libexec/" libexecdir="/${destdir}/${prefix}/libexec/"
make PREFIX="${prefix}" \
DESTDIR="${destdir}" \
LIBEXECDIR="${libexecdir}" \
install
else
echo "Install"
make PREFIX="${prefix}" \
DESTDIR="${destdir}" \
install
fi fi
echo "Install"
make PREFIX="${prefix}" \
DESTDIR="${destdir}" \
LIBEXECDIR="${libexecdir}" \
install
popd >>/dev/null popd >>/dev/null
done done
sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration.toml" sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration.toml"