summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lambiris2018-12-14 17:22:46 -0500
committerTony Lambiris2018-12-14 17:22:46 -0500
commit32b038bee765d936fa495eede82c76633d9b9c49 (patch)
treeacddf9f66962b23cdf01b7cfc82838885f06d749
parent7027e884813c9993302ac7fe6bbf10b1378b0ced (diff)
downloadaur-32b038bee765d936fa495eede82c76633d9b9c49.tar.gz
Minor build tweaks
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD24
3 files changed, 15 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0af661025de4..e567eee16e08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = clair-git
pkgdesc = Vulnerability Static Analysis for Containers
pkgver = v2.0.0.r246.g504f0f3a
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/coreos/clair
arch = x86_64
license = Apache
makedepends = git
makedepends = go
- source = clair-git::git+https://github.com/coreos/clair
+ source = clair::git+https://github.com/coreos/clair
sha256sums = SKIP
pkgname = clair-git
diff --git a/.gitignore b/.gitignore
index 14685170ec75..e9dc96b84b20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
src
pkg
-clair-git
+clair
*pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 2c0110679fa3..a34e314f2468 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,40 @@
# Maintainer: Tony Lambiris <tony@criticalstack.com>
pkgname=clair-git
+_pkgname=clair
pkgver=v2.0.0.r246.g504f0f3a
-pkgrel=1
+pkgrel=2
pkgdesc="Vulnerability Static Analysis for Containers"
arch=(x86_64)
url='https://github.com/coreos/clair'
license=(Apache)
-makedepends=(git go)
-source=("${pkgname}::git+https://github.com/coreos/clair")
+makedepends=('git' 'go')
+source=("${_pkgname}::git+https://github.com/coreos/clair")
sha256sums=('SKIP')
pkgver() {
- cd ${pkgname}
+ cd "${srcdir}/${_pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
- cd "${srcdir}/${pkgname}"
-
- mkdir -p "${srcdir}/go/src/github.com/coreos"
- ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/coreos/clair"
+ cd "${srcdir}/${_pkgname}"
+ install -m755 -d "${srcdir}/go/src/github.com/coreos/"
+ ln -sf "${srcdir}/${_pkgname}" "${srcdir}/go/src/github.com/coreos/"
}
build() {
- cd "${srcdir}/go/src/github.com/coreos/clair"
+ cd "${srcdir}/go/src/github.com/coreos/${_pkgname}"
- GOROOT="/usr/lib/go" GOPATH="${srcdir}/go" \
- go build -ldflags "-X github.com/coreos/clair/pkg/version.Version=${pkgver}" \
+ GOROOT="/usr/lib/go" GOPATH="${srcdir}/go" go build \
+ -ldflags "-X github.com/coreos/clair/pkg/version.Version=${pkgver}" \
github.com/coreos/clair/cmd/clair
}
package() {
- cd "${srcdir}/go/src/github.com/coreos/clair"
+ cd "${srcdir}/go/src/github.com/coreos/${_pkgname}"
install -Dm755 "clair" "${pkgdir}/usr/bin/clair"
install -Dm755 "config.yaml.sample" "${pkgdir}/etc/clair/config.yaml"