mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-10 13:54:12 +00:00
commit
4d545625ba
@ -48,7 +48,7 @@ replace_list=(
|
|||||||
|
|
||||||
verify
|
verify
|
||||||
rm -rf kata-containers.tar.gz
|
rm -rf kata-containers.tar.gz
|
||||||
image_tarball=$(find . -name 'kata-containers-'"${VERSION}"'-'"${kata_agent_hash:0:11}"'-*.tar.gz')
|
image_tarball=$(find . -name 'kata-containers-'"${VERSION/\~/-}"'-'"${kata_agent_hash:0:11}"'-*.tar.gz')
|
||||||
[ -f "${image_tarball}" ] || die "image not found"
|
[ -f "${image_tarball}" ] || die "image not found"
|
||||||
cp "${image_tarball}" kata-containers.tar.gz
|
cp "${image_tarball}" kata-containers.tar.gz
|
||||||
|
|
||||||
|
@ -82,4 +82,4 @@ make install \
|
|||||||
%{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers
|
%{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers
|
||||||
%{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers/vc
|
%{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers/vc
|
||||||
/usr/lib/systemd/system/kata-ksm-throttler.service
|
/usr/lib/systemd/system/kata-ksm-throttler.service
|
||||||
/usr/lib/systemd/system/vc-throttler.service
|
/usr/lib/systemd/system/kata-vc-throttler.service
|
||||||
|
@ -1,31 +1,31 @@
|
|||||||
|
|
||||||
# This is a generated file from gen_versions_txt.sh
|
# This is a generated file from gen_versions_txt.sh
|
||||||
|
|
||||||
kata_runtime_version=1.2.0
|
kata_runtime_version=1.3.0~rc1
|
||||||
kata_runtime_hash=0bcb32f7042625ea0ecee8f37b99b4459ebd5af8
|
kata_runtime_hash=22aedc4fb6b9a78a59f59df06f1b8d48021b952e
|
||||||
|
|
||||||
kata_proxy_version=1.2.0
|
kata_proxy_version=1.3.0~rc1
|
||||||
kata_proxy_hash=17962180fc61c66066905546bfd5d8933bf73df1
|
kata_proxy_hash=981fef4774ba15cf94a3a9013629d0ab60668348
|
||||||
|
|
||||||
kata_shim_version=1.2.0
|
kata_shim_version=1.3.0~rc1
|
||||||
kata_shim_hash=0a37760c0224167143cb3cc920c78f5147f52e70
|
kata_shim_hash=9b2891cfb153967fa4a65e44b2928255c889f643
|
||||||
|
|
||||||
kata_agent_version=1.2.0
|
kata_agent_version=1.3.0~rc1
|
||||||
kata_agent_hash=fcfa054a757e7c17afba47b0b4d7e91cbb8688ed
|
kata_agent_hash=1ee972176ae437bcace0a37227818c506bb64ba9
|
||||||
|
|
||||||
kata_ksm_throttler_version=1.2.0
|
kata_ksm_throttler_version=1.3.0~rc1
|
||||||
kata_ksm_throttler_hash=f232434f36b1b2c916eb6211118cf26671bd04ef
|
kata_ksm_throttler_hash=48a9568e0e9e134c4409f767a870b422ad31ff16
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
kata_osbuilder_version=1.2.0
|
kata_osbuilder_version=1.3.0~rc1
|
||||||
|
|
||||||
qemu_lite_version=2.11.0
|
qemu_lite_version=2.11.0
|
||||||
qemu_lite_hash=a39e0b3e828ff6fb4457865ef7a021f1e7320c27
|
qemu_lite_hash=f88622805677163b04498dcba35ceca0183b1318
|
||||||
|
|
||||||
qemu_vanilla_version=2.11.2
|
qemu_vanilla_version=2.11.2
|
||||||
qemu_vanilla_hash=0982a56a551556c704dc15752dabf57b4be1c640
|
qemu_vanilla_hash=0982a56a551556c704dc15752dabf57b4be1c640
|
||||||
|
|
||||||
kernel_version=4.14.51
|
kernel_version=4.14.67
|
||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
go_version=1.10.2
|
go_version=1.10.2
|
||||||
|
@ -91,7 +91,8 @@ install_image() {
|
|||||||
install_kernel() {
|
install_kernel() {
|
||||||
go get "github.com/${project}/packaging" || true
|
go get "github.com/${project}/packaging" || true
|
||||||
pushd ${GOPATH}/src/github.com/${project}/packaging >>/dev/null
|
pushd ${GOPATH}/src/github.com/${project}/packaging >>/dev/null
|
||||||
git checkout "${kata_version}-kernel-config"
|
git checkout "${kata_version}-kernel-config" ||
|
||||||
|
git checkout "${kata_version}"
|
||||||
popd >>/dev/null
|
popd >>/dev/null
|
||||||
pushd "${script_dir}/../kernel" >>/dev/null
|
pushd "${script_dir}/../kernel" >>/dev/null
|
||||||
|
|
||||||
@ -124,10 +125,14 @@ install_kata_components() {
|
|||||||
PREFIX="${prefix}" \
|
PREFIX="${prefix}" \
|
||||||
QEMUCMD="qemu-system-x86_64"
|
QEMUCMD="qemu-system-x86_64"
|
||||||
#TODO Remove libexecdir
|
#TODO Remove libexecdir
|
||||||
|
libexecdir="libexec"
|
||||||
|
if [ "$p" == "shim" ]; then
|
||||||
|
libexecdir="/${destdir}/${prefix}/libexec/"
|
||||||
|
fi
|
||||||
echo "Install"
|
echo "Install"
|
||||||
make PREFIX="${prefix}" \
|
make PREFIX="${prefix}" \
|
||||||
DESTDIR="${destdir}" \
|
DESTDIR="${destdir}" \
|
||||||
LIBEXECDIR="/${destdir}/${prefix}/libexec/" \
|
LIBEXECDIR="${libexecdir}" \
|
||||||
install
|
install
|
||||||
popd >>/dev/null
|
popd >>/dev/null
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user