diff --git a/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template b/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template index d1a6752e8..611ef0485 100644 --- a/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template +++ b/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template @@ -82,4 +82,4 @@ make install \ %{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers %{LIBEXECDIR}/kata-ksm-throttler/trigger/virtcontainers/vc /usr/lib/systemd/system/kata-ksm-throttler.service -/usr/lib/systemd/system/vc-throttler.service +/usr/lib/systemd/system/kata-vc-throttler.service diff --git a/obs-packaging/versions.txt b/obs-packaging/versions.txt index ef2ed0e05..05d676033 100644 --- a/obs-packaging/versions.txt +++ b/obs-packaging/versions.txt @@ -1,23 +1,23 @@ # This is a generated file from gen_versions_txt.sh -kata_runtime_version=1.3.0~rc0 -kata_runtime_hash=8f5fec806461729e089877f3fe9263cf519fb4de +kata_runtime_version=1.3.0~rc1 +kata_runtime_hash=22aedc4fb6b9a78a59f59df06f1b8d48021b952e -kata_proxy_version=1.3.0~rc0 -kata_proxy_hash=616676dc621672fd968539911a095d05050a2eff +kata_proxy_version=1.3.0~rc1 +kata_proxy_hash=981fef4774ba15cf94a3a9013629d0ab60668348 -kata_shim_version=1.3.0~rc0 -kata_shim_hash=41b0fe8b77d11f3268bce825d7024f41aa9164a5 +kata_shim_version=1.3.0~rc1 +kata_shim_hash=9b2891cfb153967fa4a65e44b2928255c889f643 -kata_agent_version=1.3.0~rc0 -kata_agent_hash=e3eb9cec00671706e1e99f349d09995b1f382a33 +kata_agent_version=1.3.0~rc1 +kata_agent_hash=1ee972176ae437bcace0a37227818c506bb64ba9 -kata_ksm_throttler_version=1.3.0~rc0 -kata_ksm_throttler_hash=f232434f36b1b2c916eb6211118cf26671bd04ef +kata_ksm_throttler_version=1.3.0~rc1 +kata_ksm_throttler_hash=48a9568e0e9e134c4409f767a870b422ad31ff16 # Dependencies -kata_osbuilder_version=1.3.0~rc0 +kata_osbuilder_version=1.3.0~rc1 qemu_lite_version=2.11.0 qemu_lite_hash=f88622805677163b04498dcba35ceca0183b1318 diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh index ec389eaea..578743672 100755 --- a/release/kata-deploy-binaries.sh +++ b/release/kata-deploy-binaries.sh @@ -91,7 +91,8 @@ install_image() { install_kernel() { go get "github.com/${project}/packaging" || true 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 pushd "${script_dir}/../kernel" >>/dev/null @@ -124,7 +125,7 @@ install_kata_components() { PREFIX="${prefix}" \ QEMUCMD="qemu-system-x86_64" #TODO Remove libexecdir - libexecdir="" + libexecdir="libexec" if [ "$p" == "shim" ]; then libexecdir="/${destdir}/${prefix}/libexec/" fi