summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lambiris2020-02-27 07:49:45 -0500
committerTony Lambiris2020-02-27 07:49:45 -0500
commit6752cba3a460bc3edab64cbc8ab80330450a566e (patch)
tree1ab58e51c3180c2d51c7f16504e89ff1d96889c5
parent1a9b926e40671ec4d2c3e376e45a8005b9f66782 (diff)
downloadaur-6752cba3a460bc3edab64cbc8ab80330450a566e.tar.gz
Update and fix build process
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD31
2 files changed, 11 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cdf9dbf35a7..aa664c1c4eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cilium-git
pkgdesc = API-aware Networking and Security for Containers based on BPF
- pkgver = 1.6.1.r546.gfc44651ca
+ pkgver = 1.7.0rc4.r490.gb676c4c6c7
pkgrel = 1
url = https://cilium.io/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b13c8ab1c99..add99534734 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Tony Lambiris <tony@criticalstack.com>
+# Maintainer: Tony Lambiris <tony@libpcap.net>
pkgname=cilium-git
-pkgver=1.6.1.r546.gfc44651ca
+pkgver=1.7.0rc4.r490.gb676c4c6c7
pkgrel=1
pkgdesc="API-aware Networking and Security for Containers based on BPF"
arch=('x86_64')
@@ -24,27 +24,19 @@ pkgver() {
echo "${version}.${release}" | sed -re 's/-//g' # strip hyphen
}
-build() {
- cd "${srcdir}/${pkgname}"
- mkdir -p src/github.com/cilium
- ln -s ../../../ src/github.com/cilium/cilium
+prepare() {
+ cd "${srcdir}/${pkgname}"
- mkdir -p vendor/src
- for v in vendor/*; do
- test -z "$v" -o "$v" = "vendor/src" && continue
- if test -d "$v"; then
- mv -fv "$v" vendor/src/
- fi
- done
+ install -m755 -d "${srcdir}/go/src/github.com/cilium/"
+ ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/cilium/cilium"
+}
- export GOPATH="$(pwd):$(pwd)/vendor"
- export CC="/usr/bin/gcc"
- export CXX="/usr/bin/g++"
+build() {
+ cd "${srcdir}/go/src/github.com/cilium/cilium"
+ export GOPATH="${srcdir}/go"
echo "${pkgver}" > VERSION
-
- make PKG_BUILD=1 V=1 -C daemon apply-bindata
make PKG_BUILD=1 V=1 build
}
@@ -52,12 +44,9 @@ package() {
cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" PKG_BUILD=1 V=1 -i install
-
install -Dm644 "$srcdir/cilium.sysusers" \
"$pkgdir/usr/lib/sysusers.d/cilium.conf"
-
install -m755 -d "${pkgdir}/usr/lib/systemd/system/"
-
install -Dm644 "${srcdir}/${pkgname}/contrib/systemd/"*.{service,mount} \
"${pkgdir}/usr/lib/systemd/system/"
}