summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rawlinson2019-10-26 18:10:17 +1300
committerGeorge Rawlinson2019-10-26 18:10:17 +1300
commit644794b15598a5149798d587c42acf8a60e10ce4 (patch)
tree3692d22725c86c55934b916e455405fdb0fd62e6
parentc7adb0f1d5fef592899b663dd6ef5f081e0623a8 (diff)
downloadaur-644794b15598a5149798d587c42acf8a60e10ce4.tar.gz
refactor package
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore13
-rw-r--r--PKGBUILD51
3 files changed, 44 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ca60eb70854..18ffd8b680d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
pkgbase = distrobuilder-git
pkgdesc = System container image builder for LXC and LXD
- pkgver = v1.0.3
+ pkgver = 1.0.r11.g2501aa3
pkgrel = 1
url = https://github.com/lxc/distrobuilder
arch = x86_64
- license = APACHE
+ license = Apache
makedepends = go
makedepends = git
- depends = lxc
- provides = distrobuilder
+ depends = rsync
+ depends = squashfs-tools
+ depends = gnupg
+ depends = debootstrap
conflicts = distrobuilder
source = distrobuilder::git://github.com/lxc/distrobuilder.git
sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
index c3d2c63c0b90..640b9c34e394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-/pkg/
-/src/
-/*.pkg.tar*
-/*.swp
+# folders
+pkg
+src
+distrobuilder
+
+# files
+*.log
+*.tar.*
+
diff --git a/PKGBUILD b/PKGBUILD
index f614ab477971..93401601efe2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,52 @@
-# Contributor: Stéphane Graber <stgraber AT ubuntu DOT com>
-# Maintainer: graysky <graysky AT archlinux DOT us>
# Maintainer: edacval <edacval AT gmail DOT com>
+# Maintainer: 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
-_tag=1.0
pkgname=$_pkgname-git
-pkgver=v1.0.3
+pkgver=1.0.r11.g2501aa3
pkgrel=1
pkgdesc="System container image builder for LXC and LXD"
-arch=('x86_64')
+arch=(x86_64)
url="https://$_url"
-license=('APACHE')
-depends=('lxc')
-provides=($_pkgname)
-conflicts=($_pkgname)
-makedepends=('go' 'git')
+license=(Apache)
+depends=(rsync squashfs-tools gnupg debootstrap)
+conflicts=(distrobuilder)
+makedepends=(go git)
source=($_pkgname::git://$_url.git)
sha256sums=('SKIP')
pkgver() {
cd $_pkgname
- echo "v$_tag.$(git rev-list --count $_pkgname-$_tag..)"
+ git describe --long | sed 's/^distrobuilder-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
- rm -rf "${srcdir}"/gosrc/src/$_url
- install -d "$(dirname "${srcdir}"/gosrc/src/$_url)"
- git clone -s "$srcdir"/$_pkgname "${srcdir}"/gosrc/src/$_url
- cd "${srcdir}"/gosrc/src/$_url
- gofmt -s -w -l .
- GOPATH="${srcdir}"/gosrc go get -v -d ./...
+ # create $GOPATH directory, plus some extras
+ mkdir -p $srcdir/gopath/src/github.com/lxc
+
+ # 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 ./...
}
build() {
- cd "${srcdir}"/gosrc/src/$_url/$_pkgname
- GOPATH="${srcdir}"/gosrc go build -o $_pkgname -v -trimpath -ldflags '-s -w' ./...
+ export GOPATH="$srcdir"/gopath
+ cd "$GOPATH"/src/github.com/lxc/distrobuilder
+ go install -v \
+ -trimpath \
+ -ldflags "-extldflags ${LDFLAGS}" \
+ ./...
}
package() {
- install -v -Dm755 "${srcdir}"/gosrc/src/$_url/$_pkgname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
- install -v -d "$pkgdir"/var/cache/$_pkgname
- install -v -Dm644 -t "$pkgdir"/usr/share/$_pkgname "${srcdir}"/gosrc/src/$_url/doc/examples/*
+ export GOPATH="$srcdir"/gopath
+ cd "$GOPATH"
+ install -Dm755 bin/distrobuilder "${pkgdir}/usr/bin/${_pkgname}"
}