Added Kata kernel package

2 files changed, 28 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39a8c0eaaae7..a725a5343275 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = kata-containers-git
 	pkgdesc = Lightweight virtual machines for containers (Git version)
-	pkgver = 1.12.0~rc0~runtime.r2.17cc7d6a
+	pkgver = 1.12.0~rc0~runtime.r9.9380b6e1
 	pkgrel = 1
 	url = https://katacontainers.io/
 	arch = x86_64
 	license = Apache
-	makedepends = go
+	makedepends = go<2:1.15
 	makedepends = yq2-bin
 	makedepends = bc
 	makedepends = git
@@ -17,6 +17,8 @@ pkgbase = kata-containers-git
 	source = proxy::git+https://github.com/kata-containers/proxy
 	source = runtime::git+https://github.com/kata-containers/runtime
 	source = shim::git+https://github.com/kata-containers/shim
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.60.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.60.tar.sign
 	source = 0001-osbuilder-goversion.patch
 	source = rootfs-builder-config.sh
 	source = rootfs-builder-lib.sh
@@ -28,6 +30,8 @@ pkgbase = kata-containers-git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
+	sha512sums = fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
+	sha512sums = SKIP
 	sha512sums = 0cac0aa5d0f7f0d49da9185bc71ce05a089d6339ad0d660905e18724b30381cbe3fb84b56b0de21def793ca52c945f02b99f81a6b4e77e2398da250ec8e4ff6b
 	sha512sums = 375990194988a019f2429ed85eb996222929a028a52ec609de106df8939704db6654af6d92aec5e192693d7758fc9561f236bbb29df319c2d506b5b2d2b16553
 	sha512sums = e987501a16828636b3da5cfa7b4c3af5e981aab20dee4b97d10daf8625de92e77203f7ccbfa2beff8700b32371ffa4d9f94f97216fe6abb13a475984cdf5d6e3
@@ -55,11 +59,11 @@ pkgname = kata-ksm-throttler-git
 pkgname = kata-runtime-git
 	install = kata-runtime.install
 	depends = qemu-headless
-	depends = kata-ksm-throttler
 	depends = kata-proxy
 	depends = kata-shim
 	depends = kata-linux-container
 	depends = kata-containers-image
+	optdepends = kata-ksm-throttler
 	optdepends = firecracker
 	optdepends = cloud-hypervisor
 	provides = kata-runtime
@@ -73,3 +77,7 @@ pkgname = kata-shim-git
 	provides = kata-shim
 	conflicts = kata-shim
 
+pkgname = kata-linux-container-git
+	provides = kata-linux-container
+	conflicts = kata-linux-container
+
diff --git a/PKGBUILD b/PKGBUILD
index da38042e86d0..d668a9b64cc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,16 +6,21 @@ pkgname=(
   kata-proxy-git
   kata-shim-git
 
-  #kata-linux-container-git
+  kata-linux-container-git
   #kata-containers-image-git
 )
-pkgver=1.12.0~rc0~runtime.r2.17cc7d6a
+pkgver=1.12.0~rc0~runtime.r9.9380b6e1
 pkgrel=1
 pkgdesc="Lightweight virtual machines for containers (Git version)"
 arch=('x86_64')
 url="https://katacontainers.io/"
 license=('Apache')
-makedepends=('go' 'yq2-bin' 'bc' 'git')
+makedepends=(
+  'go<2:1.15'  # thanks Intel, love you big time: https://github.com/kata-containers/runtime/issues/2982
+  'yq2-bin'
+  'bc'
+  'git'
+)
 
 _gh_org="github.com/kata-containers"
 _kata_kernel_ver="5.4.60"
@@ -29,8 +34,8 @@ source=(
   "runtime::git+https://${_gh_org}/runtime"
   "shim::git+https://${_gh_org}/shim"
 
-  #"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"
+  "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"
 
@@ -41,8 +46,8 @@ source=(
 sha512sums=(
   SKIP SKIP SKIP SKIP SKIP SKIP SKIP
 
-  #fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
-  #SKIP
+  fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
+  SKIP
   #24044fb5a9870dbe13ec7eafb60d99e664cec10d50d80a73a0445d1368c0fa95881003d92e0a1c0446f76c1bbe89b098f35ceffd0ef24e9beaa51f1a83494b98
   #SKIP
 
@@ -104,7 +109,7 @@ _kernel_prepare(){
 }
 
 prepare(){
-  #_kernel_prepare
+  _kernel_prepare
 
   # kata-container-image osbuilder fix
   cd "${srcdir}/osbuilder"
@@ -147,8 +152,8 @@ build(){
   GOPATH="${srcdir}" LDFLAGS="" make
 
   # kernel build
-  #cd "${srcdir}/linux-${_kata_kernel_ver}"
-  #make -s ARCH="${_KARCH}"
+  cd "${srcdir}/linux-${_kata_kernel_ver}"
+  make -s ARCH="${_KARCH}"
 
   #_kata_image_build
 
@@ -210,8 +215,9 @@ package_kata-proxy-git(){
 package_kata-runtime-git(){
   conflicts=('kata-runtime')
   provides=('kata-runtime')
-  depends=('qemu-headless' "kata-ksm-throttler" "kata-proxy" "kata-shim" "kata-linux-container" "kata-containers-image")
+  depends=('qemu-headless' "kata-proxy" "kata-shim" "kata-linux-container" "kata-containers-image")
   optdepends=(
+    'kata-ksm-throttler'
     'firecracker'
     'cloud-hypervisor'
     #'acrn'