From 634138145eb0d5a2d84ca953c4c06019673069d7 Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Tue, 14 May 2019 09:28:20 +0200 Subject: [PATCH 1/2] runtime: specify strict dependencies Debian package Strict dependencies guarantees that an older version of the runtime will not be installed together with a more recent version of the other kata packages. This complements commit e73473f. Fixes: #508 Signed-off-by: Marco Vedovati --- obs-packaging/runtime/debian.control-template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/obs-packaging/runtime/debian.control-template b/obs-packaging/runtime/debian.control-template index b8235e18c..ed1887de8 100644 --- a/obs-packaging/runtime/debian.control-template +++ b/obs-packaging/runtime/debian.control-template @@ -8,9 +8,9 @@ Build-Depends: dh-make, git, ca-certificates, execstack, devscripts, debhelper, Package: kata-runtime Architecture: @deb_arch@ -Depends: kata-containers-image (>= @kata_osbuilder_version@), kata-linux-container (>= @linux_container_version@), - kata-proxy (>= @kata_proxy_version@), kata-shim (>= @kata_shim_version@), - kata-ksm-throttler(>= @ksm_throttler_version@), qemu-lite(>= @qemu_lite_version@) [amd64], - qemu-vanilla(>= @qemu_vanilla_version@) +Depends: kata-containers-image (= @kata_osbuilder_version@), kata-linux-container (= @linux_container_version@), + kata-proxy (= @kata_proxy_version@), kata-shim (= @kata_shim_version@), + kata-ksm-throttler(= @ksm_throttler_version@), qemu-lite(= @qemu_lite_version@) [amd64], + qemu-vanilla(= @qemu_vanilla_version@) Description: An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x secured Kata Containers hypervisor, rather than a standard Linux container. From f2100fd4409d0f69d1d630e1bd94ab7029e50fff Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Tue, 14 May 2019 11:02:46 +0200 Subject: [PATCH 2/2] runtime: prettify Debian/Ubuntu package template Signed-off-by: Marco Vedovati --- obs-packaging/runtime/debian.control-template | 17 +++++++++++------ obs-packaging/runtime/kata-runtime.dsc-template | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/obs-packaging/runtime/debian.control-template b/obs-packaging/runtime/debian.control-template index ed1887de8..25c6e09d3 100644 --- a/obs-packaging/runtime/debian.control-template +++ b/obs-packaging/runtime/debian.control-template @@ -4,13 +4,18 @@ Priority: optional Maintainer: Kata containers team Standards-Version: 3.9.6 Homepage: https://katacontainers.io -Build-Depends: dh-make, git, ca-certificates, execstack, devscripts, debhelper, build-essential, dh-autoreconf, make +Build-Depends: dh-make, git, ca-certificates, execstack, devscripts, debhelper, + build-essential, dh-autoreconf, make Package: kata-runtime Architecture: @deb_arch@ -Depends: kata-containers-image (= @kata_osbuilder_version@), kata-linux-container (= @linux_container_version@), - kata-proxy (= @kata_proxy_version@), kata-shim (= @kata_shim_version@), - kata-ksm-throttler(= @ksm_throttler_version@), qemu-lite(= @qemu_lite_version@) [amd64], - qemu-vanilla(= @qemu_vanilla_version@) +Depends: kata-containers-image (= @kata_osbuilder_version@), + kata-linux-container (= @linux_container_version@), + kata-proxy (= @kata_proxy_version@), + kata-shim (= @kata_shim_version@), + kata-ksm-throttler(= @ksm_throttler_version@), + qemu-lite(= @qemu_lite_version@) [amd64], + qemu-vanilla(= @qemu_vanilla_version@) Description: - An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x secured Kata Containers hypervisor, rather than a standard Linux container. + An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x + secured Kata Containers hypervisor, rather than a standard Linux container. diff --git a/obs-packaging/runtime/kata-runtime.dsc-template b/obs-packaging/runtime/kata-runtime.dsc-template index d10f4b075..2c1403c58 100644 --- a/obs-packaging/runtime/kata-runtime.dsc-template +++ b/obs-packaging/runtime/kata-runtime.dsc-template @@ -7,15 +7,20 @@ Section: devel Priority: optional Maintainer: Kata containers team Standards-Version: 3.9.6 -Build-Depends: dh-make, git, ca-certificates, execstack, devscripts, debhelper, build-essential, dh-autoreconf, make +Build-Depends: dh-make, git, ca-certificates, execstack, devscripts, debhelper, + build-essential, dh-autoreconf, make Homepage: https://katacontainers.io Debtransform-Tar: kata-runtime-@VERSION@.tar.gz Package: kata-runtime Architecture: @deb_arch@ -Depends: kata-containers-image (= @kata_osbuilder_version@), kata-linux-container (= @linux_container_version@), - kata-proxy (= @kata_proxy_version@), kata-shim (= @kata_shim_version@), - kata-ksm-throttler(= @ksm_throttler_version@), qemu-lite(= @qemu_lite_version@) [amd64], - qemu-vanilla(= @qemu_vanilla_version@) +Depends: kata-containers-image (= @kata_osbuilder_version@), + kata-linux-container (= @linux_container_version@), + kata-proxy (= @kata_proxy_version@), + kata-shim (= @kata_shim_version@), + kata-ksm-throttler(= @ksm_throttler_version@), + qemu-lite(= @qemu_lite_version@) [amd64], + qemu-vanilla(= @qemu_vanilla_version@) Description: - An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x secured Kata Containers hypervisor, rather than a standard Linux container. + An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x + secured Kata Containers hypervisor, rather than a standard Linux container.