Version bump and go fixups

2 files changed, 36 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 932c1731bf29..b486389b135b 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.0.90.5301.b4740f994
+	pkgver = 1.0.90.5304.ac2be0922
 	pkgrel = 1
 	url = https://cilium.io/
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 25a3e5d8db86..751e92088f53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tony Lambiris <tony@criticalstack.com>
 
 pkgname=cilium-git
-pkgver=1.0.90.5301.b4740f994
+pkgver=1.0.90.5304.ac2be0922
 pkgrel=1
 pkgdesc="API-aware Networking and Security for Containers based on BPF"
 arch=('x86_64')
@@ -15,6 +15,20 @@ source=("${pkgname}::git+https://github.com/cilium/cilium" "cilium.sysusers")
 sha256sums=('SKIP'
             'f47ee5b436304aa55ffad29fd68e31be4b1261d3f81ba2a7a370e522705833e8')
 
+# create a fake go path directory and pushd into it
+# $1 real directory
+# $2 gopath directory
+_fake_gopath_pushd() {
+	mkdir -p "$GOPATH/src/${2%/*}"
+	rm -f "$GOPATH/src/$2"
+	ln -rsT "$1" "$GOPATH/src/$2"
+	pushd  "$GOPATH/src/$2" >/dev/null
+}
+
+_fake_gopath_popd() {
+	popd >/dev/null
+}
+
 pkgver() {
 	cd "${srcdir}/${pkgname}"
 
@@ -24,33 +38,45 @@ pkgver() {
 
 prepare() {
 	cd "${srcdir}/${pkgname}"
-	git submodule update --init --recursive
 
-	mkdir -p "${srcdir}/go/src/github.com/cilium/cilium"
-	cp -a ./* "${srcdir}/go/src/github.com/cilium/cilium/"
+	git reset HEAD --hard
+	git submodule update --init
 }
 
 build() {
-	cd "${srcdir}/go/src/github.com/cilium/cilium"
+	cd "${srcdir}"
+
+	export GOPATH="${srcdir}"
+	_fake_gopath_pushd cilium-git github.com/cilium/cilium
 
-	export GOPATH="${srcdir}/go"
-	export PATH="$GOPATH/bin:$PATH"
+	mkdir -p "${srcdir}/vendor/src"
+	for v in vendor/*; do
+		if test ${v} = vendor/src; then continue; fi
+		if test -d ${v}; then
+			mv -fv ${v} "${srcdir}/vendor/src/"
+		fi
+	done
+	export GOPATH="${GOPATH}:${srcdir}/vendor"
+
+	export CCACHE_DISABLE=1
 	export PKG_BUILD=1
 
+	make clean
 	make -C daemon apply-bindata
 	make V=1 plugins bpf cilium daemon monitor cilium-health bugtool
 
 	export CC="/usr/bin/gcc"
 	export CXX="/usr/bin/g++"
-	export CCACHE_DISABLE=1
 
 	cd envoy
 	bazel clean
 	bazel build //:envoy --action_env=PATH="$PATH"
+
+	_fake_gopath_popd
 }
 
 package() {
-	cd "${srcdir}/go/src/github.com/cilium/cilium"
+	cd "${srcdir}/${pkgname}"
 
 	make DESTDIR="${pkgdir}" install