upgpkg: distrobuilder 1.1-3

implement package check() function

2 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39855ca9ddad..517c7d63869a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = distrobuilder
 	pkgdesc = System container image builder for LXC and LXD
 	pkgver = 1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/lxc/distrobuilder
 	arch = x86_64
 	license = Apache
diff --git a/PKGBUILD b/PKGBUILD
index a99711464b70..441525dddc02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=distrobuilder
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="System container image builder for LXC and LXD"
 arch=(x86_64)
 url="https://github.com/lxc/distrobuilder"
@@ -16,31 +16,44 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgname-$pkgver.tar.gz")
 b2sums=('d1b7fe9fcc6fd65993dc0eaa610dac7bc35c0bd4e67165d94b8761e5ed906bd3ea4357f467332a6dbc02db39227d0efc4c260fae0d6fde6f63843eeacb5622d3')
 
 prepare() {
-  # go modules will solve everything, they said ...
-  export GO111MODULE=off
+  mv "$pkgname-$pkgname-$pkgver" "$pkgname-$pkgver"
 
-  # create $GOPATH directory, plus some extras
-  mkdir -p $srcdir/gopath/src/github.com/lxc
+  # export & create $GOPATH
+  export GOPATH="$srcdir/go"
+  mkdir -p "$GOPATH"
 
-  # symlink extracted source to gopath
-  ln -srfT $pkgname-$pkgname-$pkgver gopath/src/github.com/lxc/distrobuilder
-
-  # export $GOPATH & download dependencies
-  export GOPATH="$srcdir"/gopath
-  cd "$GOPATH"/src/github.com/lxc/distrobuilder
-  go get -v -d ./...
+  # download dependencies (via workaround as per below comment)
+  # https://github.com/lxc/distrobuilder/issues/408#issuecomment-801899860
+  cd "$pkgname-$pkgver"
+  go mod init github.com/lxc/distrobuilder
+  go get github.com/mudler/docker-companion/api@master
+  go get -t -d ./...
 }
 
 build() {
-  export GO111MODULE=off
-  export GOPATH="$srcdir"/gopath
-  cd "$GOPATH"/src/github.com/lxc/distrobuilder
-  go install -v \
-    -trimpath \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    ./...
+  # export various Go flags
+  export GOPATH="$srcdir/go"
+  export CGO_CPPFLAGS="$CPPFLAGS"
+  export CGO_CFLAGS="$CFLAGS"
+  export CGO_CXXFLAGS="$CXXFLAGS"
+  export CGO_LDFLAGS="$LDFLAGS"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+  # build binary
+  cd "$pkgname-$pkgver"
+  go install -v ./...
+}
+
+check() {
+  # TODO: See Makefile for additional checks
+  # - deadcode
+  # - golint
+  export GOPATH="$srcdir/go"
+  cd "$pkgname-$pkgver"
+  go test -v ./...
+  go vet -v ./...
 }
 
 package() {
-  install -Dm755 gopath/bin/distrobuilder "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 "$srcdir/go/bin/$pkgname" -t "$pkgdir/usr/bin"
 }