Version bump

3 files changed, 24 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53d619db4327..fa2faeaac0e3 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.12.0rc1.r186.g615432234c
+	pkgver = 1.12.0.rc2.r235.g7c86fe7743
 	pkgrel = 1
 	url = https://cilium.io/
 	arch = x86_64
@@ -16,8 +16,6 @@ pkgbase = cilium-git
 	optdepends = consul
 	optdepends = etcd
 	source = cilium-git::git+https://github.com/cilium/cilium
-	source = cilium.sysusers
 	sha256sums = SKIP
-	sha256sums = f47ee5b436304aa55ffad29fd68e31be4b1261d3f81ba2a7a370e522705833e8
 
 pkgname = cilium-git
diff --git a/PKGBUILD b/PKGBUILD
index 280ab03ba1b9..f66b3c80d9e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tony Lambiris <tony@libpcap.net>
 
 pkgname=cilium-git
-pkgver=1.12.0rc1.r186.g615432234c
+pkgver=1.12.0.rc2.r235.g7c86fe7743
 pkgrel=1
 pkgdesc="API-aware Networking and Security for Containers based on BPF"
 arch=('x86_64')
@@ -11,42 +11,40 @@ depends=('docker' 'iproute2' 'clang')
 makedepends=('go' 'lib32-glibc' 'bazel' 'ninja' 'docker')
 optdepends=('consul' 'etcd')
 conflicts=()
-source=("${pkgname}::git+https://github.com/cilium/cilium" "cilium.sysusers")
-sha256sums=('SKIP'
-            'f47ee5b436304aa55ffad29fd68e31be4b1261d3f81ba2a7a370e522705833e8')
+source=("${pkgname}::git+https://github.com/cilium/cilium")
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}"
 
-	version=$(git tag -l --sort=-v:refname | sed 's/v\([^-].*\)/\1/g' | head -1)
-	release=$(git describe --long --tags | sed 's/\([^-].*\)-\([0-9]*\)-\(g.*\)/r\2.\3/g')
-
-	echo "${version}.${release}" | sed -re 's/-//g' # strip hyphen
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-
 prepare() {
-	cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}"
 
-	install -m755 -d "${srcdir}/go/src/github.com/cilium/"
-	ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/cilium/cilium"
+    install -m755 -d "${srcdir}/go/src/github.com/cilium/"
+    ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/cilium/cilium"
 }
 
 build() {
-	cd "${srcdir}/go/src/github.com/cilium/cilium"
-	export GOPATH="${srcdir}/go"
+    cd "${srcdir}/go/src/github.com/cilium/cilium"
+
+    echo "${pkgver}" > VERSION
+    export GOPATH="${srcdir}/go"
+    export CFLAGS="-Werror"
 
-	echo "${pkgver}" > VERSION
-	make PKG_BUILD=1 V=1 build
+    make PKG_BUILD=1 V=1 build
 }
 
 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/"
+    cd "${srcdir}/go/src/github.com/cilium/cilium"
+
+    make DESTDIR="${pkgdir}" PKG_BUILD=1 V=1 -i install
+
+    install -m755 -d "${pkgdir}/usr/lib/systemd/system/"
+    install -Dm644 contrib/systemd/cilium.sysusers \
+        "${pkgdir}/usr/lib/sysusers.d/cilium.conf"
+    install -Dm644 contrib/systemd/*.{service,mount} \
+        "${pkgdir}/usr/lib/systemd/system/"
 }
diff --git a/cilium.sysusers b/cilium.sysusers
deleted file mode 100644
index f20a82189dc6..000000000000
--- a/cilium.sysusers
+++ /dev/null
@@ -1,2 +0,0 @@
-# create cilium group
-g cilium - -