summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rawlinson2021-03-23 17:41:24 +0000
committerGeorge Rawlinson2021-03-23 17:41:24 +0000
commit7065ced794ff3cb5fab64cb1579e44a4f282b8a7 (patch)
tree6dabf534431fc7ea6a74f8fa3921d4cd1ead9bae
parent644794b15598a5149798d587c42acf8a60e10ce4 (diff)
downloadaur-7065ced794ff3cb5fab64cb1579e44a4f282b8a7.tar.gz
upgpkg: distrobuilder 1.2-1
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD49
2 files changed, 29 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18ffd8b680d7..4e8f63222ce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = distrobuilder-git
pkgdesc = System container image builder for LXC and LXD
- pkgver = 1.0.r11.g2501aa3
+ pkgver = 1.2.r0.gb4090bb
pkgrel = 1
url = https://github.com/lxc/distrobuilder
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 93401601efe2..307ecbeabaaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
-# Maintainer: edacval <edacval AT gmail DOT com>
-# Maintainer: George Rawlinson <george@rawlinson.net.nz>
+# Contributor: edacval <edacval AT gmail DOT com>
+# Contributor: George Rawlinson <george@rawlinson.net.nz>
# Contributor: Stéphane Graber <stgraber AT ubuntu DOT com>
# Contributor: graysky <graysky AT archlinux DOT us>
_pkgname=distrobuilder
_url=github.com/lxc/$_pkgname
pkgname=$_pkgname-git
-pkgver=1.0.r11.g2501aa3
+pkgver=1.2.r0.gb4090bb
pkgrel=1
pkgdesc="System container image builder for LXC and LXD"
arch=(x86_64)
@@ -24,29 +24,36 @@ pkgver() {
}
prepare() {
- # 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 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
+ cd "$_pkgname"
+ go mod vendor
}
build() {
- 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"
+ go install -v ./...
+}
+
+check() {
+ export GOPATH="$srcdir/go"
+ cd "$_pkgname"
+ go test -v ./...
+ go vet -v ./...
}
package() {
- export GOPATH="$srcdir"/gopath
- cd "$GOPATH"
- install -Dm755 bin/distrobuilder "${pkgdir}/usr/bin/${_pkgname}"
+ install -Dm755 "$srcdir/go/bin/$_pkgname" -t "$pkgdir/usr/bin"
}