upgpkg: distrobuilder 1.1-2

go 1.16 rebuild

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f64360713fa..42b0b67a2b9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = distrobuilder
 	pkgdesc = System container image builder for LXC and LXD
 	pkgver = 1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/lxc/distrobuilder
 	arch = x86_64
 	license = Apache
@@ -13,7 +13,7 @@ pkgbase = distrobuilder
 	depends = debootstrap
 	conflicts = distrobuilder-git
 	source = distrobuilder-1.1.tar.gz::https://github.com/lxc/distrobuilder/archive/distrobuilder-1.1.tar.gz
-	sha512sums = cdbc99d30aacc6efcb6e499a8f5ad3df89d16726cc9513ee08976d01a1e86dacd4e88c37715e11da9a727e013af60481ac2ec3b3dab52ea039c5ec7d6e2f9586
+	b2sums = cdbc99d30aacc6efcb6e499a8f5ad3df89d16726cc9513ee08976d01a1e86dacd4e88c37715e11da9a727e013af60481ac2ec3b3dab52ea039c5ec7d6e2f9586
 
 pkgname = distrobuilder
 
diff --git a/PKGBUILD b/PKGBUILD
index c31f3cd689d4..503f3673dce3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=distrobuilder
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="System container image builder for LXC and LXD"
 arch=(x86_64)
 url="https://github.com/lxc/distrobuilder"
@@ -12,10 +12,13 @@ license=(Apache)
 depends=(rsync squashfs-tools gnupg debootstrap)
 makedepends=(go git)
 conflicts=(distrobuilder-git)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/lxc/$pkgname/archive/$pkgname-$pkgver.tar.gz")
-sha512sums=('cdbc99d30aacc6efcb6e499a8f5ad3df89d16726cc9513ee08976d01a1e86dacd4e88c37715e11da9a727e013af60481ac2ec3b3dab52ea039c5ec7d6e2f9586')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgname-$pkgver.tar.gz")
+b2sums=('cdbc99d30aacc6efcb6e499a8f5ad3df89d16726cc9513ee08976d01a1e86dacd4e88c37715e11da9a727e013af60481ac2ec3b3dab52ea039c5ec7d6e2f9586')
 
 prepare() {
+  # go modules will solve everything, they said ...
+  export GO111MODULE=off
+
   # create $GOPATH directory, plus some extras
   mkdir -p $srcdir/gopath/src/github.com/lxc
 
@@ -29,6 +32,7 @@ prepare() {
 }
 
 build() {
+  export GO111MODULE=off
   export GOPATH="$srcdir"/gopath
   cd "$GOPATH"/src/github.com/lxc/distrobuilder
   go install -v \
@@ -38,7 +42,5 @@ build() {
 }
 
 package() {
-  export GOPATH="$srcdir"/gopath
-  cd "$GOPATH"
-  install -Dm755 bin/distrobuilder "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 gopath/bin/distrobuilder "${pkgdir}/usr/bin/${pkgname}"
 }