From b9f49bc3f059239a418b5ce22e5d7888be846327 Mon Sep 17 00:00:00 2001 From: Brad Erhart <> Date: Wed, 30 Jun 2021 10:04:05 -0700 Subject: [PATCH] Updating to gVisor v20210628.0 --- .SRCINFO | 9 ++++----- .gitignore | 3 +-- PKGBUILD | 8 ++++---- gvisor-bin.install | 8 ++++---- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fb350f0..7de78e4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,18 +1,17 @@ pkgbase = gvisor-bin pkgdesc = OCI container sandbox runtime focused on security, efficiency, and ease of use - pkgver = 20210518.0 + pkgver = 20210628.0 pkgrel = 1 url = https://gvisor.dev install = gvisor-bin.install arch = x86_64 license = Apache - depends = docker + optdepends = docker: for Docker runtime support provides = gvisor provides = runsc conflicts = gvisor-git conflicts = runsc - source = gvisor-bin-20210518.0::https://storage.googleapis.com/gvisor/releases/release/20210518.0/x86_64/runsc - b2sums = 7983fc051ed641d13b1ac3039a764ca0cb6af3c3e007bb682c6d7d8aad7d29483f3cebc6fae913e3832b08d2a8f36194a4e2ccbbc0418f25275137655f9944b8 + source = gvisor-bin-20210628.0::https://storage.googleapis.com/gvisor/releases/release/20210628/x86_64/runsc + b2sums = 12ae13d2fab74265a549feb91cfb9fb10a261de10285ac816b254d105b0a11c87dbccd82e185840a250f8dc5c9eb6cf3803b6d3f7f58bc2998033856e2155b43 pkgname = gvisor-bin - diff --git a/.gitignore b/.gitignore index bc96b67..e6c6385 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.tar.* -gvisor-bin-* +gvisor* pkg/ src/ diff --git a/PKGBUILD b/PKGBUILD index 87e9176..43f9c9b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,13 +2,13 @@ pkgname=gvisor-bin _pkgname=runsc -pkgver=20210518.0 +pkgver=20210628.0 pkgrel=1 pkgdesc='OCI container sandbox runtime focused on security, efficiency, and ease of use' arch=('x86_64') url='https://gvisor.dev' license=('Apache') -depends=('docker') +optdepends=('docker: for Docker runtime support') provides=( "${pkgname%-bin}" "$_pkgname" @@ -18,8 +18,8 @@ conflicts=( "$_pkgname" ) install="$pkgname.install" -source=("$pkgname-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/$arch/$_pkgname") -b2sums=(7983fc051ed641d13b1ac3039a764ca0cb6af3c3e007bb682c6d7d8aad7d29483f3cebc6fae913e3832b08d2a8f36194a4e2ccbbc0418f25275137655f9944b8) +source=("$pkgname-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/${pkgver%.[0-9]}/$arch/$_pkgname") +b2sums=(12ae13d2fab74265a549feb91cfb9fb10a261de10285ac816b254d105b0a11c87dbccd82e185840a250f8dc5c9eb6cf3803b6d3f7f58bc2998033856e2155b43) package() { install -Dm 755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$_pkgname" diff --git a/gvisor-bin.install b/gvisor-bin.install index adc2bb2..9a0212b 100644 --- a/gvisor-bin.install +++ b/gvisor-bin.install @@ -1,15 +1,15 @@ post_install() { - runsc install + pacman --query docker &> /dev/null && runsc install } pre_upgrade() { - runsc uninstall + pacman --query docker &> /dev/null && runsc uninstall } post_upgrade() { - runsc install + pacman --query docker &> /dev/null && runsc install } pre_remove() { - runsc uninstall + pacman --query docker &> /dev/null && runsc uninstall }