summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzer0def2020-10-25 14:57:26 +0100
committerzer0def2020-10-25 16:08:36 +0100
commit32403d11b7cdc307f10747aa5c048d9848938319 (patch)
treef239c43a1f7e56464aa4478d0e3c9f8c6512d16e
parentc2f87b758d3a409a9bc097373f8f3f10f8025105 (diff)
downloadaur-32403d11b7cdc307f10747aa5c048d9848938319.tar.gz
Fork out Kata 2.0 packages.
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD43
-rw-r--r--kata-runtime.install44
-rw-r--r--kata2-runtime.install9
4 files changed, 43 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25d0c97ba628..8188a62454c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = kata-containers-bin
+pkgbase = kata2-containers-bin
pkgdesc = Lightweight virtual machines for containers (binary version)
pkgver = 2.0.0
pkgrel = 1
@@ -9,21 +9,24 @@ pkgbase = kata-containers-bin
sha512sums = a201f14d4e88307a8959b158aeaa2789906a913c0463aa60a6124befcb5f6e6c9b107c6cd30e0f3392901c6727972083b9261ec1b4d2d4755c58fa6c6106eca9
b2sums = 7bd43eb6facb6012b9c02613588683bea6fe8b3e1cbeb828bdabb7df815acd7c6c6cd9dc85ccc8956d1c304c342a33b356706947f4801c28b3f035b1403d2936
-pkgname = kata-runtime-bin
- install = kata-runtime.install
+pkgname = kata2-runtime-bin
+ install = kata2-runtime.install
depends = qemu-headless
- depends = kata-containers-image
- depends = kata-linux-container
+ depends = kata2-containers-image
+ depends = kata2-linux-container
optdepends = cloud-hypervisor<0.11.0
optdepends = firecracker<0.22.0
- provides = kata-runtime
+ provides = kata2-runtime
+ conflicts = kata2-runtime
conflicts = kata-runtime
-pkgname = kata-containers-image-bin
- provides = kata-containers-image
+pkgname = kata2-containers-image-bin
+ provides = kata2-containers-image
+ conflicts = kata2-containers-image
conflicts = kata-containers-image
-pkgname = kata-linux-container-bin
- provides = kata-linux-container
+pkgname = kata2-linux-container-bin
+ provides = kata2-linux-container
+ conflicts = kata2-linux-container
conflicts = kata-linux-container
diff --git a/PKGBUILD b/PKGBUILD
index e05e6ad48e3c..7c9a93236168 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
# Contributor: Kaushal M <kshlmster cat gmail dog com>
# Contributor: Stefan Zwanenburg <stefan cat zwanenburg dog info>
-pkgbase=kata-containers-bin
+pkgbase=kata2-containers-bin
pkgname=(
- kata-runtime-bin
- kata-containers-image-bin
- kata-linux-container-bin
+ kata2-runtime-bin
+ kata2-containers-image-bin
+ kata2-linux-container-bin
)
pkgver="2.0.0"
_pkgver=${pkgver/\~/-}
@@ -20,16 +20,16 @@ license=('Apache')
_bin_pkg_root="/opt/kata" # `/usr` for f30 packages, `/opt/kata` for static packages
if [ "${_bin_pkg_root}" = "/opt/kata" ]; then
- #pkgname+=(kata-containers-static)
+ #pkgname+=(kata2-containers-static)
source=("https://github.com/kata-containers/kata-containers/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
sha512sums=(a201f14d4e88307a8959b158aeaa2789906a913c0463aa60a6124befcb5f6e6c9b107c6cd30e0f3392901c6727972083b9261ec1b4d2d4755c58fa6c6106eca9)
b2sums=(7bd43eb6facb6012b9c02613588683bea6fe8b3e1cbeb828bdabb7df815acd7c6c6cd9dc85ccc8956d1c304c342a33b356706947f4801c28b3f035b1403d2936)
else
- _kata_kernel_ver="5.4.32.75"
- _default_suffix="-7.1" # f30 package build revision
+ _kata_kernel_ver="5.4.32.76"
+ _default_suffix="-8.1" # f30 package build revision
#_image_suffix="-6.1"
#_ksm_suffix="-6.1"
- #_kernel_suffix="-6.1"
+ _kernel_suffix="-9.1"
#_proxy_suffix="-6.1"
#_runtime_suffix="-6.1"
#_shim_suffix="-6.1"
@@ -57,28 +57,27 @@ else
)
fi
-package_kata-runtime-bin() {
- depends=(qemu-headless kata-containers-image kata-linux-container)
+package_kata2-runtime-bin() {
+ depends=(qemu-headless kata2-containers-image kata2-linux-container)
optdepends=(
'cloud-hypervisor<0.11.0'
'firecracker<0.22.0'
)
- conflicts=('kata-runtime')
- provides=('kata-runtime')
- install=kata-runtime.install
+ conflicts=('kata2-runtime' 'kata-runtime')
+ provides=('kata2-runtime')
+ install=kata2-runtime.install
install -D -m 0755 -t ${pkgdir}/usr/bin ${srcdir}${_bin_pkg_root}/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
install -D -m 0755 {${srcdir}${_bin_pkg_root}/libexec,${pkgdir}/usr/lib}/kata-containers/kata-netmon
install -D -m 0644 {${srcdir}${_bin_pkg_root},${pkgdir}/usr}/share/bash-completion/completions/kata-runtime
install -D -m 0644 -t ${pkgdir}/usr/share/defaults/kata-containers ${srcdir}${_bin_pkg_root}/share/defaults/kata-containers/*.toml
- sed -i 's/libexec/lib/' ${pkgdir}/usr/share/defaults/kata-containers/*.toml ${pkgdir}/usr/bin/kata-collect-data.sh
- sed -i -e 's/qemu-lite/qemu/' -e 's/qemu-vanilla/qemu/' ${pkgdir}/usr/share/defaults/kata-containers/configuration.toml ${pkgdir}/usr/bin/kata-collect-data.sh
+ sed -i -e "s;${_bin_pkg_root};/usr;" -e 's/libexec/lib/' -e 's/kata-qemu/qemu/' -e 's/qemu-lite/qemu/' -e 's/qemu-vanilla/qemu/' ${pkgdir}/usr/share/defaults/kata-containers/*.toml ${pkgdir}/usr/bin/kata-collect-data.sh
}
-package_kata-containers-image-bin(){
- conflicts=('kata-containers-image')
- provides=('kata-containers-image')
+package_kata2-containers-image-bin(){
+ conflicts=('kata2-containers-image' 'kata-containers-image')
+ provides=('kata2-containers-image')
install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
${srcdir}${_bin_pkg_root}/share/kata-containers/kata-containers-image_clearlinux_${_pkgver}_agent_*.img \
${srcdir}${_bin_pkg_root}/share/kata-containers/kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd
@@ -87,9 +86,9 @@ package_kata-containers-image-bin(){
ln -s kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd kata-containers-initrd.img
}
-package_kata-linux-container-bin(){
- conflicts=('kata-linux-container')
- provides=('kata-linux-container')
+package_kata2-linux-container-bin(){
+ conflicts=('kata2-linux-container' 'kata-linux-container')
+ provides=('kata2-linux-container')
install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinux-* \
${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinuz-*
@@ -103,6 +102,6 @@ package_kata-linux-container-bin(){
ln -s vmlinuz-[0-9].[0-9]* vmlinuz.container
}
-package_kata-containers-static(){
+package_kata2-containers-static(){
cp -dr --no-preserve='ownership' "${srcdir}/opt" "${pkgdir}/opt"
}
diff --git a/kata-runtime.install b/kata-runtime.install
deleted file mode 100644
index bf29b5a97eae..000000000000
--- a/kata-runtime.install
+++ /dev/null
@@ -1,44 +0,0 @@
-post_install() {
- cat <<EOF
-
-To use kata-runtime with docker,
-- add the following config to /etc/docker/daemon.json
-"""
-{
- "runtimes": {
- "kata": {
- "path": "/usr/bin/kata-runtime"
- }
- }
-}
-"""
- and restart the docker daemon
-
-- run containers with the "--runtime=kata" options to use kata-runtime
-"""
-$ docker run --runtime=kata --rm busybox date
-"""
-
-- to set Kata as the default runtime, add '"default-runtime": "kata"' to /etc/docker/daemon.json and restart the docker daemon
-"""
-{
- "default-runtime": "kata",
- "runtimes": {
- "kata": {
- "path": "/usr/bin/kata-runtime"
- },
- }
-}
-
-"""
-
-- to run Kata with Firecracker, due to Firecracker's limitations, you have to set your Docker storage driver (ref: https://docs.docker.com/storage/storagedriver/select-storage-driver/ ) to 'devicemapper' in /etc/docker/daemon.json
-"""
-{
- "storage-driver": "devicemapper"
-}
-"""
-
-EOF
-
-}
diff --git a/kata2-runtime.install b/kata2-runtime.install
new file mode 100644
index 000000000000..cdf8a5a82615
--- /dev/null
+++ b/kata2-runtime.install
@@ -0,0 +1,9 @@
+post_install() {
+ cat <<EOF
+Due to Docker hard-codied usage of OCI runtime shim v1, the closest replacement
+is to call containerd CLI, for example as follows:
+
+ ctr image pull docker.io/library/alpine:edge
+ ctr run --rm -t --runtime io.containerd.kata.v2 docker.io/library/alpine:edge example-container-name date
+EOF
+}