Changes for rootless Kata. Add default configuration files for other hypervisors.

2 files changed, 44 insertions, 97 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89493cccfdeb..9604598458e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,16 @@
 pkgbase = kata-containers
 	pkgdesc = Lightweight virtual machines for containers
 	pkgver = 1.9.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
-	noextract = kata-runtime-1.9.2-7.1.x86_64.rpm
-	noextract = kata-proxy-bin-1.9.2-7.1.x86_64.rpm
-	noextract = kata-shim-bin-1.9.2-7.1.x86_64.rpm
-	noextract = kata-ksm-throttler-1.9.2-7.1.x86_64.rpm
-	noextract = kata-containers-image-1.9.2-7.1.x86_64.rpm
-	noextract = kata-linux-container-4.19.75.54-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-runtime-1.9.2-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-proxy-bin-1.9.2-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-shim-bin-1.9.2-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-ksm-throttler-1.9.2-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-containers-image-1.9.2-7.1.x86_64.rpm
-	source = http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-linux-container-4.19.75.54-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-runtime-1.9.2-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-proxy-bin-1.9.2-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-shim-bin-1.9.2-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-ksm-throttler-1.9.2-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-containers-image-1.9.2-7.1.x86_64.rpm
+	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64/kata-linux-container-4.19.75.54-7.1.x86_64.rpm
 	sha256sums = b5f47b9d905d4d265b6ded744a0413b1a5b1c24b4adec66449095afa5ab8e6ee
 	sha256sums = 772500f64cfb7cd046e4d46c440e00bab665a276bf4d2cfea6016a7141ae5434
 	sha256sums = 60615672c1aa926fafc591abd0a78302b7b78fea2f0e6f2dd810746dd5bc8b6b
@@ -32,6 +26,8 @@ pkgname = kata-runtime
 	depends = kata-ksm-throttler=1.9.2
 	depends = kata-containers-image=1.9.2
 	depends = kata-linux-container=1.9.2
+	optdepends = nemu
+	optdepends = firecracker-git
 
 pkgname = kata-proxy
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a65d028b314..b0b5c095ffea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,51 +5,29 @@
 pkgbase=kata-containers
 pkgname=(kata-runtime kata-proxy kata-shim kata-ksm-throttler kata-containers-image kata-linux-container)
 pkgver="1.9.2"
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight virtual machines for containers"
 arch=(x86_64)
 url="https://katacontainers.io"
 license=('Apache')
 
+__dlbase="https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}"
+__linux_container_ver="4.19.75.54"
 __default_suffix="-7.1"
 #__runtime_suffix="-7.1"
 #__proxy_suffix="-7.1"
 #__shim_suffix="-7.1"
 #__ksm_throttler_suffix="-7.1"
 #__img_suffix="-7.1"
-__linux_container_ver="4.19.75.54"
 #__linux_container_suffix="-7.1"
 
-__runtime_rpm="kata-runtime-${pkgver}${__runtime_suffix:-${__default_suffix}}.x86_64.rpm"
-__proxy_bin_rpm="kata-proxy-bin-${pkgver}${__proxy_suffix:-${__default_suffix}}.x86_64.rpm"
-__shim_bin_rpm="kata-shim-bin-${pkgver}${__shim_suffix:-${__default_suffix}}.x86_64.rpm"
-__ksm_throttler_rpm="kata-ksm-throttler-${pkgver}${__ksm_throttler_suffix:-${__default_suffix}}.x86_64.rpm"
-__img_rpm="kata-containers-image-${pkgver}${__img_suffix:-${__default_suffix}}.x86_64.rpm"
-__linux_container_rpm="kata-linux-container-${__linux_container_ver}${__linux_container_suffix:-${__default_suffix}}.x86_64.rpm"
-
-__dlbase="http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.9/Fedora_30/x86_64"
-__runtime_src="${__dlbase}/${__runtime_rpm}"
-__proxy_bin_src="${__dlbase}/${__proxy_bin_rpm}"
-__shim_bin_src="${__dlbase}/${__shim_bin_rpm}"
-__ksm_throttler_src="${__dlbase}/${__ksm_throttler_rpm}"
-__img_src="${__dlbase}/${__img_rpm}"
-__linux_container_src="${__dlbase}/${__linux_container_rpm}"
-
 source=(
-  $__runtime_src
-  $__proxy_bin_src
-  $__shim_bin_src
-  $__ksm_throttler_src
-  $__img_src
-  $__linux_container_src
-)
-noextract=(
-  $__runtime_rpm
-  $__proxy_bin_rpm
-  $__shim_bin_rpm
-  $__ksm_throttler_rpm
-  $__img_rpm
-  $__linux_container_rpm
+  "${__dlbase}/kata-runtime-${pkgver}${__runtime_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "${__dlbase}/kata-proxy-bin-${pkgver}${__proxy_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "${__dlbase}/kata-shim-bin-${pkgver}${__shim_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "${__dlbase}/kata-ksm-throttler-${pkgver}${__ksm_throttler_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "${__dlbase}/kata-containers-image-${pkgver}${__img_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "${__dlbase}/kata-linux-container-${__linux_container_ver}${__linux_container_suffix:-${__default_suffix}}.${CARCH}.rpm"
 )
 
 sha256sums=(
@@ -61,77 +39,50 @@ sha256sums=(
   'a78fcecac7afb9e7c2e81bc84a73287f9ff471ba7300978aacb0a6b88598494f'
 )
 
-__extract_into_dir() {
-  archive=$1
-  dir=$2
-  echo Extracting $(basename $archive) into $dir using bsdtar
-  bsdtar -C $dir -xf $archive
-}
-
-prepare() {
-  pushd $srcdir
-
-  mkdir -p {kata-runtime,kata-proxy,kata-shim,kata-ksm-throttler,kata-containers-image,kata-linux-container}-${pkgver}
-
-  __extract_into_dir $__runtime_rpm kata-runtime-${pkgver}
-  __extract_into_dir $__proxy_bin_rpm kata-proxy-${pkgver}
-  __extract_into_dir $__shim_bin_rpm kata-shim-${pkgver}
-  __extract_into_dir $__ksm_throttler_rpm kata-ksm-throttler-${pkgver}
-  __extract_into_dir $__img_rpm kata-containers-image-${pkgver}
-  __extract_into_dir $__linux_container_rpm kata-linux-container-${pkgver}
-
-  popd
-}
-
 package_kata-runtime() {
   depends=(qemu kata-proxy=${pkgver} kata-shim=${pkgver} kata-ksm-throttler=${pkgver} kata-containers-image=${pkgver} kata-linux-container=${pkgver})
+  optdepends=(
+      "nemu"
+      "firecracker-git"  # only until the package sets it's `provides` field
+      #"acrn"  # some day?
+  )
   install=kata-runtime.install
 
-  pushd $srcdir/kata-runtime-${pkgver}
-  install -D -m 0755 {,$pkgdir/}usr/bin/containerd-shim-kata-v2
-  install -D -m 0755 {,$pkgdir/}usr/bin/kata-runtime
-  install -D -m 0755 {,$pkgdir/}usr/bin/kata-collect-data.sh
-  install -D -m 0755 usr/libexec/kata-containers/kata-netmon $pkgdir/usr/lib/kata-containers/kata-netmon
-  install -D -m 0644 {,$pkgdir/}usr/share/bash-completion/completions/kata-runtime
-  install -D -m 0644 {,$pkgdir/}usr/share/defaults/kata-containers/configuration.toml
+  install -D -m 0755 -t ${pkgdir}/usr/bin ${srcdir}/usr/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
+  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-netmon
+  install -D -m 0644 {${srcdir},${pkgdir}}/usr/share/bash-completion/completions/kata-runtime
+  install -D -m 0644 -t ${pkgdir}/usr/share/defaults/kata-containers ${srcdir}/usr/share/defaults/kata-containers/*.toml
 
-  sed -i s/libexec/lib/ $pkgdir/usr/share/defaults/kata-containers/configuration.toml
-  sed -i s/qemu-lite/qemu/ $pkgdir/usr/share/defaults/kata-containers/configuration.toml
-  popd
+  sed -i -e 's/libexec/lib/' ${pkgdir}/usr/share/defaults/kata-containers/*.toml ${pkgdir}/usr/bin/kata-collect-data.sh
+  sed -i -e 's/qemu-lite/qemu/' ${pkgdir}/usr/share/defaults/kata-containers/configuration.toml ${pkgdir}/usr/bin/kata-collect-data.sh
 }
 
 package_kata-proxy() {
-  pushd $srcdir/kata-proxy-${pkgver}
-  install -D -m 0755 usr/libexec/kata-containers/kata-proxy $pkgdir/usr/lib/kata-containers/kata-proxy
-  popd
+  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-proxy
 }
 
 package_kata-shim() {
-  pushd $srcdir/kata-shim-${pkgver}
-  install -D -m 0755 usr/libexec/kata-containers/kata-shim $pkgdir/usr/lib/kata-containers/kata-shim
-  popd
+  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
 }
 
 package_kata-ksm-throttler() {
-  pushd $srcdir/kata-ksm-throttler-${pkgver}
-  install -D -m 0644 {,$pkgdir/}usr/lib/systemd/system/kata-ksm-throttler.service
-  install -D -m 0644 {,$pkgdir/}usr/lib/systemd/system/kata-vc-throttler.service
-  install -D -m 0755 usr/libexec/kata-ksm-throttler/kata-ksm-throttler $pkgdir/usr/lib/kata-ksm-throttler/kata-ksm-throttler
-  install -D -m 0755 usr/libexec/kata-ksm-throttler/trigger/virtcontainers/vc $pkgdir/usr/lib/kata-ksm-throttler/trigger/virtcontainers/vc
-
-  sed -i 's/libexec/lib/' $pkgdir/usr/lib/systemd/system/kata-ksm-throttler.service $pkgdir/usr/lib/systemd/system/kata-vc-throttler.service
-  popd
+  install -D -m 0644 -t ${pkgdir}/usr/lib/systemd/system ${srcdir}/usr/lib/systemd/system/kata-{ksm,vc}-throttler.service
+  sed -i 's/libexec/lib/' ${pkgdir}/usr/lib/systemd/system/kata-{ksm,vc}-throttler.service
+  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-ksm-throttler/kata-ksm-throttler
+  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-ksm-throttler/trigger/virtcontainers/vc
+  install -d -m 0755 ${pkgdir}/var/lib/vc/{sbs,uuid}
 }
 
 package_kata-containers-image() {
-  pushd $srcdir/kata-containers-image-${pkgver}
-  cp -a usr $pkgdir
-  popd
+  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-image_clearlinux_1.9.2_agent_ba81eb84dd.img
+  ln -sf kata-containers-image_clearlinux_1.9.2_agent_ba81eb84dd.img ${pkgdir}/usr/share/kata-containers/kata-containers.img
+  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-initrd_alpine_1.9.2_agent_ba81eb84dd.initrd
+  ln -sf kata-containers-initrd_alpine_1.9.2_agent_ba81eb84dd.initrd ${pkgdir}/usr/share/kata-containers/kata-containers-initrd.img
 }
 
 package_kata-linux-container() {
-  pushd $srcdir/kata-linux-container-${pkgver}
-  cp -a usr $pkgdir
-  rm -rf $pkgdir/usr/lib
-  popd
+  for i in vmlinu{x,z}; do
+    install -D -m 0644 {${srcdir},${pkgdir}}/usr/share/kata-containers/${i}-${__linux_container_ver}${__linux_container_suffix:-${__default_suffix}}.container
+    ln -sf ${i}-${__linux_container_ver}${__linux_container_suffix:-${__default_suffix}}.container ${pkgdir}/usr/share/kata-containers/${i}.container
+  done
 }