Rewrite, update to 1.28.4+k3s2

2 files changed, 57 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88d6a989a76f..d225083287ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
-# Generated by mksrcinfo v8
-# Sun Mar  3 16:48:31 UTC 2019
 pkgbase = k3s-git
 	pkgdesc = Lightweight Kubernetes
-	pkgver = r1.f90cbed
+	pkgver = 1.28.4+k3s2+r8+g231cb6ed20
 	pkgrel = 1
-	url = https://github.com/rancher/k3s
+	url = https://k3s.io
 	arch = x86_64
-	license = APACHE
-	makedepends = docker
+	license = Apache
 	makedepends = git
 	makedepends = go
-	makedepends = setconf
+	provides = k3s
+	conflicts = k3s
+	backup = etc/systemd/system/k3s.service.env
+	source = git+https://github.com/k3s-io/k3s
+	source = k3s.service.env
+	sha256sums = SKIP
+	sha256sums = 667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0
 
 pkgname = k3s-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9b3fda6f8bf0..2c2d9f5e0694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,63 @@
-# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org>
+# Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
 
 pkgname=k3s-git
-pkgver=r1.f90cbed
+pkgver=1.28.4+k3s2+r8+g231cb6ed20
 pkgrel=1
 pkgdesc='Lightweight Kubernetes'
 arch=(x86_64)
-url='https://github.com/rancher/k3s'
-license=(APACHE)
-makedepends=(docker git go setconf)
+url='https://k3s.io'
+license=(Apache)
+makedepends=(git go)
+provides=(k3s)
+conflicts=(k3s)
+backup=(
+  etc/systemd/system/k3s.service.env
+)
+source=(
+  "git+https://github.com/k3s-io/k3s"
+  'k3s.service.env'
+)
+sha256sums=(
+  'SKIP'
+  '667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0'
+)
 
 pkgver() {
-  cd $pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  git clone --depth=1 "https://github.com/rancher/k3s" $pkgname 2>/dev/null || (cd $pkgname; git fetch origin; git reset --hard origin/master)
-  setconf "$pkgname/k3s.service" ExecStart '/usr/bin/k3s server'
+  cd k3s
+  git describe --long --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 build() {
-  make -C $pkgname
+  cd k3s
+  mkdir -p build/data
+  make download
+  make generate
+  make
 }
 
 package() {
-  install -Dm755 $pkgname/dist/artifacts/k3s "$pkgdir/usr/bin/k3s"
-  install -Dm755 $pkgname/dist/artifacts/hyperkube "$pkgdir/usr/bin/hyperkube"
-  install -Dm644 $pkgname/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 $pkgname/k3s.service "$pkgdir/usr/lib/systemd/system/k3s.service"
+  cd k3s
+
+  install -Dm755 \
+    dist/artifacts/k3s \
+    dist/artifacts/hyperkube \
+    -t "$pkgdir/usr/bin"
+
+  install -Dm644 \
+    k3s.service \
+    -t "$pkgdir/usr/lib/systemd/system"
+
+  install -Dm644 \
+    k3s-rootless.service \
+    -t "$pkgdir/usr/lib/systemd/user"
+
+  install -Dm600 \
+    "$srcdir/k3s.service.env" \
+    -t "$pkgdir/etc/systemd/system"
+
+  install -Dm644 \
+    LICENSE \
+    -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 # vim: ts=2 sw=2 et:
-