Split out guest side artifacts

3 files changed, 62 insertions, 176 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dcf42fbe01cc..b14cb3e294f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,59 +1,40 @@
-pkgbase = kata-containers
-	pkgdesc = Lightweight virtual machines for containers
+pkgbase = kata-containers-guest
+	pkgdesc = Lightweight virtual machines for containers (guest components)
 	pkgver = 1.11.4
-	pkgrel = 2
+	pkgrel = 1
 	url = https://katacontainers.io/
 	arch = x86_64
 	license = Apache
 	makedepends = go<2:1.15
-	noextract = archlinux-bootstrap-2020.08.01-x86_64.tar.gz
+	makedepends = yq2-bin
+	makedepends = mkinitcpio
+	makedepends = udisks2
+	noextract = archlinux-bootstrap-2020.11.01-x86_64.tar.gz
 	source = agent-1.11.4.tar.gz::https://github.com/kata-containers/agent/archive/1.11.4.tar.gz
-	source = ksm-throttler-1.11.4.tar.gz::https://github.com/kata-containers/ksm-throttler/archive/1.11.4.tar.gz
 	source = osbuilder-1.11.4.tar.gz::https://github.com/kata-containers/osbuilder/archive/1.11.4.tar.gz
 	source = packaging-1.11.4.tar.gz::https://github.com/kata-containers/packaging/archive/1.11.4.tar.gz
-	source = proxy-1.11.4.tar.gz::https://github.com/kata-containers/proxy/archive/1.11.4.tar.gz
-	source = runtime-1.11.4.tar.gz::https://github.com/kata-containers/runtime/archive/1.11.4.tar.gz
-	source = shim-1.11.4.tar.gz::https://github.com/kata-containers/shim/archive/1.11.4.tar.gz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.32.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.32.tar.sign
+	source = http://mirrors.evowise.com/archlinux/iso/2020.11.01/archlinux-bootstrap-2020.11.01-x86_64.tar.gz
+	source = http://mirrors.evowise.com/archlinux/iso/2020.11.01/archlinux-bootstrap-2020.11.01-x86_64.tar.gz.sig
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
+	validpgpkeys = 4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC
 	sha512sums = e0af374e279899a010ab66ed4fd4caff33c91d2cc19711f5e51302041cd49e69a71909d71092042bf0c4070acbbc5421f5c6cca49c55a4c332c060e745cf5a0c
-	sha512sums = 326fe4e74313110b7afd4a701946ac90808ecd02643656cef27a180d5d47645e4bad5ede3ba9fb29cbfce1a691fb10d2136485fff4bcc651192c28e795102e43
 	sha512sums = b8f8998229e2f12491cf6f9262cf8889353e83c58e93010ca3f328f77b61f89fb33d9209b21a1babae406f60b915011edb0832b803dd31b32115dfffa1b2edb1
 	sha512sums = 867f8fbf9c589535a10696a14c26aa6b9b3c6344690105489d55ed1287bdbd56909eb8052a22b4be98e8eb697fc57021212780ff41e478438c71a5c20d7446ad
-	sha512sums = e19619110b4162e22bc4fa6c17330d9d77519a015971acbd8101ef9b4fbab728eb5779dc8c98c77e99a9a6355ce09408b37ecd440cef24ff8bb3e2e3156ef160
-	sha512sums = f5b932d19b13a6150037d4929038142e218e752bf8cd52bf5a19b29abcf0bb377683ba84c9412b5f744549099d12ba82c2a35188230af759991ffff5eca7bce1
-	sha512sums = 8632772e67c2e045a9363eb00af3309632a5b15b8afe12a1756ae74fa484a0e7f9293b019355f483c6771a9294e09d518d40f34d15c114a0ca2bca90712171ab
 	sha512sums = 197f292fa541031071b8ed64880a3d4251fa65059747cbdf3900b8f934d17f681b506ca5f70132899bdef343d2d249a7902215d2ea04af5410599f1e50d6cbac
 	sha512sums = SKIP
+	sha512sums = 91a3f0a1cbc7addb1941bc583b364b411e28223580980063ddc950cf4a0d247b0c40dbac6462f39d4d2f20102a8ff643b02179fa7dba685ae588962ea778c5d3
+	sha512sums = SKIP
 	b2sums = 94e996c463f0c5517bc6d97af2cb0f1dbadccd7e5f2ef5c45ea15d1deb5af65770371f25a0b9421ba70fa50a0b8c22c7d5a443173515ad4c5db30c1fa72cd395
-	b2sums = 5302020c94d0fe47ae605be048da8080e4aa9ab9ba8a669772ba4389240917e94d7ab61252b0866db17d471942ccefba9b4871b365f359b7d9d6fae3e70b801e
 	b2sums = 6c30855fc7d5298dbe8c6b7e294edbf840e123083fecfa3d73d91e741dcca70af6ca0c10672eb6fa24dd886b3ebddccefcff943b4c816ce65c2f05588947660e
 	b2sums = 6194835f2526a7b16e5b8ca97fb831fdfb78a951dec51c8640c8cff6efd5186ed051e717ff748af7913bdf339f5a69e1b5c9aff2d70c732a4876481ac6fb59ea
-	b2sums = f514bb42482fcdf54454cb6e2362a45a897f6e3cd748ebd1bab7d1fe4a0736ec27bfa07d8ccc7bd7b037c4cf097bb23ecd69b2f93d31f9028c8dafc28fecd39d
-	b2sums = 4721581ccc2c4af854091dd60ef6134e7285672993c99a0e0f4932de422d887b197ad80176fbc1a2f4085dfe9ae8baf044ee0728a92b7aedbc02139e62e84c0c
-	b2sums = 0625dc648f976b2aa0dc8b9a8b06eb0e25b043f68506861aa85888646648df347adfe7d1b94c24315315f6f81e1fb9c89d6f07102401b6eb2b4de8c818001d55
 	b2sums = 0ac78d1eb97ce4689ccdab01fb1475d07f29a90251b44b05fcf030d2f9aa644ac9dbb1315c7fe1eb991ef1435b7f17669e2b4f66187e3404599a0f136d2b1a50
 	b2sums = SKIP
+	b2sums = ce8bfce07a121780e6a09f2b652b0be3fb3c728cd0cccedaad4add394784a6ded18c5163d2a999fc8043cdc9eb6fc347aa6a26a990b31f1f4a445f83460eccc3
+	b2sums = SKIP
 
 pkgname = kata-agent
 
-pkgname = kata-ksm-throttler
-
-pkgname = kata-runtime
-	install = kata-runtime.install
-	depends = qemu-headless
-	depends = kata-proxy=1.11.4
-	depends = kata-shim=1.11.4
-	depends = kata-linux-container
-	depends = kata-containers-image
-	optdepends = kata-ksm-throttler=1.11.4
-	optdepends = firecracker<0.22.0
-	optdepends = cloud-hypervisor<0.8.0
-
-pkgname = kata-proxy
-
-pkgname = kata-shim
-
 pkgname = kata-linux-container
 
diff --git a/APKBUILD b/APKBUILD
deleted file mode 100644
index d11c40a80c74..000000000000
--- a/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: zer0def <zer0def@zer0def.0>
-# Contributor: Kaushal M <kshlmster cat gmail dog com>
-# Contributor: Stefan Zwanenburg <stefan cat zwanenburg dog info>
-pkgname=kata-runtime
-subpackages="kata-proxy kata-shim"
-pkgver=1.10.0_rc0
-_pkgver="${pkgver/_/-}"
-pkgrel=1
-pkgdesc="Lightweight virtual machines for containers"
-arch='x86_64'
-url="https://katacontainers.io/"
-license='Apache'
-makedepends='go make linux-headers'
-_gh_org="github.com/kata-containers"
-source="proxy-${_pkgver}.tar.gz::https://${_gh_org}/proxy/archive/${_pkgver}.tar.gz runtime-${_pkgver}.tar.gz::https://${_gh_org}/runtime/archive/${_pkgver}.tar.gz shim-${_pkgver}.tar.gz::https://${_gh_org}/shim/archive/${_pkgver}.tar.gz https://github.com/mikefarah/yq/releases/download/2.4.1/yq_linux_amd64"
-
-#abuild-keygen -a && for i in deps fetch checksum unpack prepare build rootpkg; do abuild ${i}; done
-prepare(){
-  mkdir -p "${srcdir}/src/${_gh_org}" "${srcdir}/bin"
-  mv "${srcdir}/yq_linux_amd64" "${srcdir}/bin/yq"
-  chmod +x "${srcdir}/bin/yq"
-  for i in proxy runtime shim; do
-    rm -rf "${srcdir}/src/${_gh_org}/${i}"
-    mv "${srcdir}/${i}-${_pkgver}" "${srcdir}/src/${_gh_org}/${i}"
-  done
-}
-
-build(){
-  export PATH="${srcdir}/bin:${PATH}"
-  for i in proxy runtime shim; do
-    echo "Building kata-${i}…"
-    cd "${srcdir}/src/${_gh_org}/${i}"
-    GOPATH="${srcdir}" make DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-  done
-}
-
-package(){
-  cd "${srcdir}/src/${_gh_org}/runtime"
-  sed -i 's/install --mode 0644 /install /' Makefile
-  GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-}
-
-proxy(){
-  cd "${srcdir}/src/${_gh_org}/proxy"
-  GOPATH="${srcdir}" make install DESTDIR="${subpkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-}
-
-shim(){
-  cd "${srcdir}/src/${_gh_org}/shim"
-  GOPATH="${srcdir}" make install DESTDIR="${subpkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-}
-sha512sums="0471b8e876c3a49772d56a72e99dd4d36ad5136bbefc212250c83a78f29f0f6e03cc5fd94d70fc61d2b07613ff19fc9a1dfde915364e15838b6b4f6916278e5a  proxy-1.10.0-rc0.tar.gz
-93c1be4386563e246276f5e10a4a65f2fe084c5fbf9e79b65b0541f9ec72281119380bd94eb4022c573461b6b2ddbd3777b0b50de9645f54b5499e40107117d6  runtime-1.10.0-rc0.tar.gz
-426baf82874b614347772d824f7e8a8c02505f41f060ebef931c6f2bc112b41ad4209703994e22808d35e046f8e9e750177a8a07fe596028081595b1ccf3c807  shim-1.10.0-rc0.tar.gz
-224b9d6b48ba565c792af465962293e994b8922b83649348771a27c026468b823cdb8e49ba4a8f989b26d31ea46be0032b44a7af253b251eeafab2077299fac0  yq_linux_amd64"
diff --git a/PKGBUILD b/PKGBUILD
index 9bd0d7938884..8cfa7548647a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,73 +1,67 @@
 # Maintainer: zer0def <zer0def@github>
 # Contributor: Kaushal M <kshlmster cat gmail dog com>
 # Contributor: Stefan Zwanenburg <stefan cat zwanenburg dog info>
-pkgbase=kata-containers
+pkgbase=kata-containers-guest
 pkgname=(
   kata-agent
-  kata-ksm-throttler
-  kata-runtime
-  kata-proxy
-  kata-shim
-
   kata-linux-container
   #kata-containers-image
 )
 pkgver=1.11.4
 _pkgver=${pkgver/\~/-}
-pkgrel=2
-pkgdesc="Lightweight virtual machines for containers"
+pkgrel=1
+pkgdesc="Lightweight virtual machines for containers (guest components)"
 arch=('x86_64')
 url="https://katacontainers.io/"
 license=('Apache')
 makedepends=(
   'go<2:1.15'  # thanks Intel, love you big time: https://github.com/kata-containers/runtime/issues/2982
+  'yq2-bin'  # quietly pulled by Kata's codebase to read versions.yaml from repo
+  'mkinitcpio'  # initrd build
+  'udisks2'  # rootless image build
 )
 
 _gh_org="github.com/kata-containers"
-_kata_kernel_ver="5.4.32"
+_kata_kernel_ver="${KATA_KERNEL_VER:-5.4.32}"
+_arch_bootstrap_ver="${ARCH_BOOTSTRAP_VER:-2020.11.01}"
 
 source=(
   "agent-${_pkgver}.tar.gz::https://${_gh_org}/agent/archive/${_pkgver}.tar.gz"
-  "ksm-throttler-${_pkgver}.tar.gz::https://${_gh_org}/ksm-throttler/archive/${_pkgver}.tar.gz"
   "osbuilder-${_pkgver}.tar.gz::https://${_gh_org}/osbuilder/archive/${_pkgver}.tar.gz"
   "packaging-${_pkgver}.tar.gz::https://${_gh_org}/packaging/archive/${_pkgver}.tar.gz"
-  "proxy-${_pkgver}.tar.gz::https://${_gh_org}/proxy/archive/${_pkgver}.tar.gz"
-  "runtime-${_pkgver}.tar.gz::https://${_gh_org}/runtime/archive/${_pkgver}.tar.gz"
-  "shim-${_pkgver}.tar.gz::https://${_gh_org}/shim/archive/${_pkgver}.tar.gz"
+
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_kata_kernel_ver}.tar.xz"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_kata_kernel_ver}.tar.sign"
-  #"http://mirrors.evowise.com/archlinux/iso/2020.08.01/archlinux-bootstrap-2020.08.01-x86_64.tar.gz"
-  #"http://mirrors.evowise.com/archlinux/iso/2020.08.01/archlinux-bootstrap-2020.08.01-x86_64.tar.gz.sig"
+
+  "http://mirrors.evowise.com/archlinux/iso/${_arch_bootstrap_ver}/archlinux-bootstrap-${_arch_bootstrap_ver}-x86_64.tar.gz"
+  "http://mirrors.evowise.com/archlinux/iso/${_arch_bootstrap_ver}/archlinux-bootstrap-${_arch_bootstrap_ver}-x86_64.tar.gz.sig"
 )
 sha512sums=(
-  e0af374e279899a010ab66ed4fd4caff33c91d2cc19711f5e51302041cd49e69a71909d71092042bf0c4070acbbc5421f5c6cca49c55a4c332c060e745cf5a0c
-  326fe4e74313110b7afd4a701946ac90808ecd02643656cef27a180d5d47645e4bad5ede3ba9fb29cbfce1a691fb10d2136485fff4bcc651192c28e795102e43
-  b8f8998229e2f12491cf6f9262cf8889353e83c58e93010ca3f328f77b61f89fb33d9209b21a1babae406f60b915011edb0832b803dd31b32115dfffa1b2edb1
-  867f8fbf9c589535a10696a14c26aa6b9b3c6344690105489d55ed1287bdbd56909eb8052a22b4be98e8eb697fc57021212780ff41e478438c71a5c20d7446ad
-  e19619110b4162e22bc4fa6c17330d9d77519a015971acbd8101ef9b4fbab728eb5779dc8c98c77e99a9a6355ce09408b37ecd440cef24ff8bb3e2e3156ef160
-  f5b932d19b13a6150037d4929038142e218e752bf8cd52bf5a19b29abcf0bb377683ba84c9412b5f744549099d12ba82c2a35188230af759991ffff5eca7bce1
-  8632772e67c2e045a9363eb00af3309632a5b15b8afe12a1756ae74fa484a0e7f9293b019355f483c6771a9294e09d518d40f34d15c114a0ca2bca90712171ab
-  197f292fa541031071b8ed64880a3d4251fa65059747cbdf3900b8f934d17f681b506ca5f70132899bdef343d2d249a7902215d2ea04af5410599f1e50d6cbac
-  SKIP
-  #24044fb5a9870dbe13ec7eafb60d99e664cec10d50d80a73a0445d1368c0fa95881003d92e0a1c0446f76c1bbe89b098f35ceffd0ef24e9beaa51f1a83494b98
-  #SKIP
+  "e0af374e279899a010ab66ed4fd4caff33c91d2cc19711f5e51302041cd49e69a71909d71092042bf0c4070acbbc5421f5c6cca49c55a4c332c060e745cf5a0c"
+  "b8f8998229e2f12491cf6f9262cf8889353e83c58e93010ca3f328f77b61f89fb33d9209b21a1babae406f60b915011edb0832b803dd31b32115dfffa1b2edb1"
+  "867f8fbf9c589535a10696a14c26aa6b9b3c6344690105489d55ed1287bdbd56909eb8052a22b4be98e8eb697fc57021212780ff41e478438c71a5c20d7446ad"
+
+  "${KATA_KERNEL_SUM_SHA512:-197f292fa541031071b8ed64880a3d4251fa65059747cbdf3900b8f934d17f681b506ca5f70132899bdef343d2d249a7902215d2ea04af5410599f1e50d6cbac}"
+  "SKIP"
+
+  "${ARCH_BOOTSTRAP_SUM_SHA512:-91a3f0a1cbc7addb1941bc583b364b411e28223580980063ddc950cf4a0d247b0c40dbac6462f39d4d2f20102a8ff643b02179fa7dba685ae588962ea778c5d3}"
+  "SKIP"
 )
 b2sums=(
-  94e996c463f0c5517bc6d97af2cb0f1dbadccd7e5f2ef5c45ea15d1deb5af65770371f25a0b9421ba70fa50a0b8c22c7d5a443173515ad4c5db30c1fa72cd395
-  5302020c94d0fe47ae605be048da8080e4aa9ab9ba8a669772ba4389240917e94d7ab61252b0866db17d471942ccefba9b4871b365f359b7d9d6fae3e70b801e
-  6c30855fc7d5298dbe8c6b7e294edbf840e123083fecfa3d73d91e741dcca70af6ca0c10672eb6fa24dd886b3ebddccefcff943b4c816ce65c2f05588947660e
-  6194835f2526a7b16e5b8ca97fb831fdfb78a951dec51c8640c8cff6efd5186ed051e717ff748af7913bdf339f5a69e1b5c9aff2d70c732a4876481ac6fb59ea
-  f514bb42482fcdf54454cb6e2362a45a897f6e3cd748ebd1bab7d1fe4a0736ec27bfa07d8ccc7bd7b037c4cf097bb23ecd69b2f93d31f9028c8dafc28fecd39d
-  4721581ccc2c4af854091dd60ef6134e7285672993c99a0e0f4932de422d887b197ad80176fbc1a2f4085dfe9ae8baf044ee0728a92b7aedbc02139e62e84c0c
-  0625dc648f976b2aa0dc8b9a8b06eb0e25b043f68506861aa85888646648df347adfe7d1b94c24315315f6f81e1fb9c89d6f07102401b6eb2b4de8c818001d55
-  0ac78d1eb97ce4689ccdab01fb1475d07f29a90251b44b05fcf030d2f9aa644ac9dbb1315c7fe1eb991ef1435b7f17669e2b4f66187e3404599a0f136d2b1a50
-  SKIP
-  #24044fb5a9870dbe13ec7eafb60d99e664cec10d50d80a73a0445d1368c0fa95881003d92e0a1c0446f76c1bbe89b098f35ceffd0ef24e9beaa51f1a83494b98
-  #SKIP
+  "94e996c463f0c5517bc6d97af2cb0f1dbadccd7e5f2ef5c45ea15d1deb5af65770371f25a0b9421ba70fa50a0b8c22c7d5a443173515ad4c5db30c1fa72cd395"
+  "6c30855fc7d5298dbe8c6b7e294edbf840e123083fecfa3d73d91e741dcca70af6ca0c10672eb6fa24dd886b3ebddccefcff943b4c816ce65c2f05588947660e"
+  "6194835f2526a7b16e5b8ca97fb831fdfb78a951dec51c8640c8cff6efd5186ed051e717ff748af7913bdf339f5a69e1b5c9aff2d70c732a4876481ac6fb59ea"
+
+  "${KATA_KERNEL_SUM_B2:-0ac78d1eb97ce4689ccdab01fb1475d07f29a90251b44b05fcf030d2f9aa644ac9dbb1315c7fe1eb991ef1435b7f17669e2b4f66187e3404599a0f136d2b1a50}"
+  "SKIP"
+
+  "${ARCH_BOOTSTRAP_SUM_B2:-ce8bfce07a121780e6a09f2b652b0be3fb3c728cd0cccedaad4add394784a6ded18c5163d2a999fc8043cdc9eb6fc347aa6a26a990b31f1f4a445f83460eccc3}"
+  "SKIP"
 )
-noextract=('archlinux-bootstrap-2020.08.01-x86_64.tar.gz')
+noextract=("archlinux-bootstrap-${_arch_bootstrap_ver}-x86_64.tar.gz")
 validpgpkeys=(
   647F28654894E3BD457199BE38DBBDC86092693E  # kernel
+  4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC  # arch
 )
 
 case "${CARCH}" in
@@ -88,7 +82,7 @@ _kernel_prepare(){
   make -s mrproper
   rm -f .config
 
-  _KCONFIG="$(find "${srcdir}/packaging-${_pkgver}/kernel/configs" -type f -name "${_KARCH}_kata_kvm_${_kata_kernel_ver%.*}.x")"
+  local -r _KCONFIG="$(find "${srcdir}/packaging-${_pkgver}/kernel/configs" -type f -name "${_KARCH}_kata_kvm_${_kata_kernel_ver%.*}.x")"
   if [ -z "${_KCONFIG}" ]; then
     KCONFIG_CONFIG=.config ARCH=${_KARCH} scripts/kconfig/merge_config.sh -r -n "${srcdir}/packaging-${_pkgver}/kernel/configs/fragments/common/"*.conf "${srcdir}/packaging-${_pkgver}/kernel/configs/fragments/${_KARCH}/"*.conf
   else
@@ -100,16 +94,16 @@ _kernel_prepare(){
 prepare(){
   _kernel_prepare
 
-  mkdir -p "${srcdir}/src/${_gh_org}"
-  for i in agent ksm-throttler proxy runtime shim; do
-    rm -rf "${srcdir}/src/${_gh_org}/${i}"
-    mv "${srcdir}/${i}-${_pkgver}" "${srcdir}/src/${_gh_org}/${i}"
-  done
+  install -dm0755 "${srcdir}/bin"
+  ln -sf "$(type -p yq)" "${srcdir}/bin/yq"
+
+  install -dm0755 "${srcdir}/src/${_gh_org}"
+  mv "${srcdir}/agent-${_pkgver}" "${srcdir}/src/${_gh_org}/agent"
 }
 
 _kata_image_build(){
   # rootfs and initrd build (it's horrid, but somewhat works)
-  _ROOTFS_DIR="${srcdir}/osbuilder-${_pkgver}/rootfs-builder/rootfs"
+  local -r _ROOTFS_DIR="${srcdir}/osbuilder-${_pkgver}/rootfs-builder/rootfs"
 
   # build rootfs
   install -D -m 0644 "${srcdir}/rootfs-builder-config.sh" "${srcdir}/osbuilder-${_pkgver}/rootfs-builder/archlinux/config.sh"
@@ -121,10 +115,6 @@ _kata_image_build(){
   # rootfs image (need to bypass root requirement somehow)
   cd "${srcdir}/osbuilder-${_pkgver}/image-builder"
   ./image_builder.sh "${_ROOTFS_DIR}"
-
-  # initrd
-  cd "${srcdir}/osbuilder-${_pkgver}/initrd-builder"
-  ./initrd_builder.sh "${_ROOTFS_DIR}"
 }
 
 build(){
@@ -136,11 +126,6 @@ build(){
   make -s ARCH="${_KARCH}"
 
   #_kata_image_build
-
-  for i in ksm-throttler proxy runtime shim; do
-    cd "${srcdir}/src/${_gh_org}/${i}"
-    GOPATH="${srcdir}" make DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-  done
 }
 
 package_kata-agent(){
@@ -149,22 +134,18 @@ package_kata-agent(){
 }
 
 package_kata-containers-image(){
-  #install -D -m 0644 "${srcdir}/osbuilder-${_pkgver}/image-builder/kata-containers.img" "${pkgdir}/usr/share/kata-containers/kata-containers-image_archlinux_${pkgver%%~*}_agent_git.img"
-  install -D -m 0644 "${srcdir}/osbuilder-${_pkgver}/initrd-builder/kata-containers-initrd.img" "${pkgdir}/usr/share/kata-containers/kata-containers-initrd_archlinux_${pkgver%%~*}_agent_git.initrd"
-  cd "${pkgdir}/usr/share/kata-containers"
-  #ln -sf "kata-containers-image_archlinux_${pkgver%%~*}_agent_git.img" "kata-containers.img"
-  ln -sf "kata-containers-initrd_archlinux_${pkgver%%~*}_agent_git.initrd" "kata-containers-initrd.img"
-}
-
-package_kata-ksm-throttler(){
-  cd "${srcdir}/src/${_gh_org}/ksm-throttler"
-  GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-  install -d -m 0755 "${pkgdir}/var/lib/vc/{firecracker,sbs,uuid}"
+  local -r _img_filename="kata-containers-${_pkgver%%~*}-arch-systemd-image.img" _initrd_filename="kata-containers-${_pkgver%%~*}-arch-agent-initrd.img"
+  #install -D -m 0644 "${srcdir}/osbuilder-${_pkgver}/image-builder/kata-containers.img" "${pkgdir}/usr/share/kata-containers/${_img_filename}"
+  install -D -m 0644 "${srcdir}/osbuilder-${_pkgver}/initrd-builder/kata-containers-initrd.img" "${pkgdir}/usr/share/kata-containers/${_initrd_filename}"
+  pushd "${pkgdir}/usr/share/kata-containers"
+  #ln -sf "${_img_filename}" "kata-containers-arch.img"
+  ln -sf "${_initrd_filename}" "kata-containers-arch-initrd.img"
+  popd
 }
 
 package_kata-linux-container(){
   install -D -m 0644 "${srcdir}/linux-${_kata_kernel_ver}/vmlinux" "${pkgdir}/usr/share/kata-containers/vmlinux-${_kata_kernel_ver}.container"
-  cd "${pkgdir}/usr/share/kata-containers"
+  pushd "${pkgdir}/usr/share/kata-containers"
   ln -sf "vmlinux-${_kata_kernel_ver}.container" vmlinux.container
   if [ "${_KARCH}" = "powerpc" ]; then
     ln -sf "vmlinux-${_kata_kernel_ver}.container" "vmlinuz-${_kata_kernel_ver}.container"
@@ -174,26 +155,5 @@ package_kata-linux-container(){
     install -D -m 0644 "${srcdir}/linux-${_kata_kernel_ver}/arch/${_KARCH}/boot/bzImage" "${pkgdir}/usr/share/kata-containers/vmlinuz-${_kata_kernel_ver}.container"
     ln -sf "vmlinuz-${_kata_kernel_ver}.container" vmlinuz.container
   fi
-}
-
-package_kata-proxy(){
-  cd "${srcdir}/src/${_gh_org}/proxy"
-  GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-}
-
-package_kata-runtime(){
-  depends=('qemu-headless' "kata-proxy=${pkgver}" "kata-shim=${pkgver}" "kata-linux-container" "kata-containers-image")
-  optdepends=(
-    "kata-ksm-throttler=${pkgver}"
-    'firecracker<0.22.0'
-    'cloud-hypervisor<0.8.0'
-  )
-  install=kata-runtime.install
-  cd "${srcdir}/src/${_gh_org}/runtime"
-  GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
-}
-
-package_kata-shim(){
-  cd "${srcdir}/src/${_gh_org}/shim"
-  GOPATH="${srcdir}" make install DESTDIR="${pkgdir}" BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib"
+  popd
 }