Split out linux-kata into separate pkgbase.

1 files changed, 2 insertions, 81 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 39a8e3a540de..da80ecd29d01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,11 @@ pkgbase=kata-containers
 pkgname=(
   kata-agent
   kata-runtime
-  kata-linux-container
   #kata-containers-image
 )
 pkgver=2.1.0
 _pkgver=${pkgver/\~/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight virtual machines for containers, version 2"
 arch=('x86_64')
 url="https://katacontainers.io/"
@@ -23,12 +22,9 @@ makedepends=(
 )
 
 _gh_org="github.com/kata-containers"
-_kata_kernel_ver="${KATA_KERNEL_VER:-5.10.25}"
 
 source=(
   "${pkgbase}-${_pkgver}.tar.gz::https://${_gh_org}/kata-containers/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"
 
   # mknitcpio-busybox
   "mkinitcpio-agent.conf"
@@ -39,16 +35,9 @@ source=(
   "install_sd-kata-agent.tpl"
   "kata-agent.service.in"
   "kata-containers.target"
-
-  # https://lkml.org/lkml/2021/1/23/75
-  "0001-config-preemption.diff"
-
-  "btrfs.kconfig"
 )
 sha512sums=(
   "ccfc712168738fce1f26b14fbe4a0dcecd9d1f3a0698c06487d98091173951be141c06b4314712ea9b67cda93d2efa8701c3b9afc8770458147defa5adbabf1a"
-  "${KATA_KERNEL_SUM_SHA512:-20d81a5930f4877e4a67930c8fc52406767bc1c1ca65a78037e4f42738bae54009a59d1a21e3bfde773f67af608a763e67a8829564b3665cae937dbc19947c13}"
-  "SKIP"
 
   "182a249aecbab33b8704e9567e96d33b535ee59e6d2f52f0c30fbc3d12813f60192886539cc745933caaf59268925d78db9e0b6b427321e2bac932ebde77d62e"
   "0250e52251986f36cfb9e378d848f755caaf5253daa8ff7d87172f2622754c1eb4180b338a497e3fbeb880e232eef19d5e512f5a8e610e7a6eb468f210849a08"
@@ -57,15 +46,9 @@ sha512sums=(
   "60e2dee0afcfc52b6075309b4eeb55c75dc4a8f063274f2cd481a0056fae0e78e414f0422af26acddff93edb43a23cb52c26aefd92677160fd8eb6a685b6a6d6"
   "8f927f482d54a762ae5c952883034355a76c5547993ed4245a434a74014aa96e6c5182e3ece0a431e075c1d2f86e99ed0d0d8d839586821c5a7cdf053ec6963d"
   "b599a62d07f4451f52747eaf185142fbe8eeb9aced211369fc83d88c43483ef1008f87615fcfcf30d74a557569b89d5fcb4a61326ffc8cb0559ec51807d808ca"
-
-  "76c27fe0e2b84a9ae0d4b0e2a96ef0c07777811991b4aae21c88494b91fa2837fb67be335cebf4874e5e3235b5ba4641ec4544f9e055765e2dcf399d9d875e8c"
-
-  "ed3011a9fee8dd2fb16a004305b23e6b79158afcfe6d88ccdf471b177a8fbe4a9da92924e437284de83a69cebdf5cca2312b614906c404c0d22692aeca491510"
 )
 b2sums=(
   "ee14536ba48ece1beba2409082446b18b80450233335bf2b9644604cf3d97404caa9f58a0ca1de69da50cd900e0b7ee5f9b046e206b9235ed77b9deccb2399d6"
-  "${KATA_KERNEL_SUM_B2:-1aa774dcd894f4f5a24cc26375dac4dfe0b8d1c37e58c6878dd81c2f6466a8fbb635b46e881bec75b00c041c6d0c73c545bd10ff25afde6a5bca1e63e165e51c}"
-  "SKIP"
 
   "43c81141a65fd14b60ae72c5b98168bec531990903cc7c8b224b416c71d1d05c1cf3f73891954604e0b0c6f48c52a3a41a8e9e78874a79e72b14282373108e8b"
   "9abf2208af353019ba177d8a48ba613401742cd21258a79c5d9cb8518a51f4f22a41dc386b71f2d6521d03f6ff65d8710dc59d1ca9c7c1dc5f94061c7374286c"
@@ -74,13 +57,6 @@ b2sums=(
   "1ce51ec8cfac8149e3d421d58ec4cb5df2119f4c4d6371da3406297f87a35b6453a9a91bfce9b3b6ac81945b9c8c8237d5818b7321198635614148a8001e3da7"
   "8b5371fe7b1858dc61dcf4153b58f9c7a5ba564299d657c2bc4eac2328801346e9ca3f6f441dcca710e89495e5b7f9d35b002a8e031eb3cbd4a4fa850566309a"
   "60bb47bec6e35ccc460ac066d7205d084ab8bdc7d1749918ce0497983a6e7eb770ca9fd996f44b05dbdbfc35390bf2d02b7e8abc619fa6d9df298988d5f19053"
-
-  "919319ddcaac3f7c5b1c1998fced9920f3e7e9d4660c83e380495fc3a14d5f4e82736ac9435fdb78512576f1d90f80b1ad017529f2b42e013b844ed3ec4bc99f"
-
-  "803eb3483722e7eab50102b8d0f9dc1ea7f38781d1f61e5998137469e019cb49d944a30c97f465c5b03916322955fcf29629af27ac47f2e19210bee3d63c488e"
-)
-validpgpkeys=(
-  647F28654894E3BD457199BE38DBBDC86092693E  # kernel
 )
 
 case "${CARCH}" in
@@ -90,34 +66,7 @@ case "${CARCH}" in
   ppc64le)    _KARCH=powerpc;;
 esac
 
-_kernel_prepare(){
-  # kata2-linux-container prep (ref: https://github.com/kata-containers/packaging/tree/master/kernel )
-  for i in vanilla btrfs; do
-    cp -a "${srcdir}/linux-${_kata_kernel_ver}" "${srcdir}/linux-${_kata_kernel_ver}-${i}"
-    pushd "${srcdir}/linux-${_kata_kernel_ver}-${i}"
-    #for p in $(find "${srcdir}/${pkgbase}-${_pkgver}/tools/packaging/kernel/patches" -type f -name "*.patch"); do
-    #  patch -p1 <"${p}"
-    #done
-
-    # kernel config prep from upstream ("${srcdir}/${pkgbase}-${_pkgver}/tools/packaging/obs-packaging/linux-container/kata-linux-container.spec-template")
-    make -s mrproper
-    rm -f .config
-
-    local _KCONFIG="$(find "${srcdir}/${pkgbase}-${_pkgver}/tools/packaging/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}/${pkgbase}-${_pkgver}/tools/packaging/kernel/configs/fragments/common/"*.conf "${srcdir}/${pkgbase}-${_pkgver}/tools/packaging/kernel/configs/fragments/${_KARCH}/"*.conf
-    else
-      install -Dm 0644 "${_KCONFIG}" .config
-    fi
-    [ "${i}" = "btrfs" ] && cat "${srcdir}/btrfs.kconfig" >> .config
-    make -s ARCH="${_KARCH}" oldconfig
-    popd
-  done
-}
-
 prepare(){
-  _kernel_prepare
-
   #install -dm0755 "${srcdir}/bin"
   #ln -sf "$(command -v yq)" "${srcdir}/bin/yq"
 
@@ -162,13 +111,6 @@ build(){
   cd "${srcdir}/${pkgbase}-${_pkgver}"
   GOPATH="${srcdir}" make BINDIR="/usr/bin" PKGLIBEXECDIR="/usr/lib/kata-containers" LIBEXECDIR="/usr/lib" LIBC=gnu
 
-  # kernel build
-  for i in vanilla btrfs; do
-    pushd "${srcdir}/linux-${_kata_kernel_ver}-${i}"
-    make -s ARCH="${_KARCH}"
-    popd
-  done
-
   #mkinitcpio -c "${srcdir}/mkinitcpio-agent.conf" -g "${srcdir}/initrd-arch-agent.img" -D "${srcdir}/initcpio-agent"
   #mkinitcpio -c "${srcdir}/mkinitcpio-systemd.conf" -g "${srcdir}/initrd-arch-systemd.img" -D "${srcdir}/initcpio-systemd"
   #_kata_image_build
@@ -195,29 +137,8 @@ package_kata-containers-image(){
   popd
 }
 
-package_kata-linux-container(){
-  local i suffix
-  install -dm0755 "${pkgdir}/usr/share/kata-containers"
-  pushd "${pkgdir}/usr/share/kata-containers"
-  for i in vanilla btrfs; do
-    [ "${i}" = "vanilla" ] && suffix="" || suffix="-${i}"
-    install -Dm 0644 "${srcdir}/linux-${_kata_kernel_ver}-${i}/arch/${_KARCH}/boot/bzImage" "${pkgdir}/usr/share/kata-containers/vmlinux-${_kata_kernel_ver}${suffix}.container"
-    #install -Dm 0644 "${srcdir}/linux-${_kata_kernel_ver}/vmlinux" "${pkgdir}/usr/share/kata-containers/vmlinux-${_kata_kernel_ver}.container"
-    ln -sf "vmlinux-${_kata_kernel_ver}${suffix}.container" "vmlinux${suffix}.container"
-    if [ "${_KARCH}" = "powerpc" ]; then
-      ln -sf "vmlinux-${_kata_kernel_ver}${suffix}.container" "vmlinuz-${_kata_kernel_ver}${suffix}.container"
-      ln -sf "vmlinuz-${_kata_kernel_ver}${suffix}.container" "vmlinuz${suffix}.container"
-    else
-      # param out bzImage for other archs?
-      install -Dm 0644 "${srcdir}/linux-${_kata_kernel_ver}-${i}/arch/${_KARCH}/boot/bzImage" "${pkgdir}/usr/share/kata-containers/vmlinuz-${_kata_kernel_ver}${suffix}.container"
-      ln -sf "vmlinuz-${_kata_kernel_ver}${suffix}.container" "vmlinuz${suffix}.container"
-    fi
-  done
-  popd
-}
-
 package_kata-runtime(){
-  depends=('qemu-headless' "kata-linux-container" "kata-containers-image")
+  depends=('qemu-headless' "linux-kata" "kata-containers-image")
   optdepends=(
     'firecracker<0.24.0'
     'cloud-hypervisor<16.0'