testing/lxd: upgrade to 3.8

2 files changed, 61 insertions, 17 deletions

diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD
index 5d7768bd71..c28d2402dd 100644
--- a/testing/lxd/APKBUILD
+++ b/testing/lxd/APKBUILD
@@ -1,21 +1,22 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=lxd
-pkgver=3.2
-pkgrel=1
+pkgver=3.8
+pkgrel=0
 pkgdesc="a container hypervisor and a new user experience for LXC"
 url="https://linuxcontainers.org/lxd/"
 arch="all"
 license="Apache-2.0"
 depends="acl xz netcat-openbsd cgmanager squashfs-tools rsync shadow-uidmap lxc ip6tables dnsmasq ca-certificates"
-makedepends="lxc-dev protobuf-dev rsync go gettext-dev linux-headers acl-dev"
-subpackages="$pkgname-scripts:scripts:noarch $pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
+makedepends="lxc-dev protobuf-dev rsync go gettext-dev linux-headers acl-dev 
+	tcl-dev libtool autoconf automake sqlite-dev libuv-dev"
+subpackages="$pkgname-scripts:scripts $pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
 install="$pkgname.pre-install"
 options="!check"
 source="https://linuxcontainers.org/downloads/$pkgname/$pkgname-$pkgver.tar.gz
-	lxd-dont-go-get.patch
 	$pkgname.confd
-	$pkgname.initd"
+	$pkgname.initd
+	lxd-dont-go-get.patch"
 _project="github.com/lxc/lxd"
 
 builddir="$srcdir"/lxd-$pkgver
@@ -32,8 +33,11 @@ prepare() {
 build() {
 	cd "$builddir"
 	export GOPATH="$builddir/dist"
+	make deps
 	#https://github.com/lxc/lxd/issues/496
-	export CGO_LDFLAGS=-lintl
+	export CGO_CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/"
+	export CGO_LDFLAGS="-lintl -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/"
+	export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/"
 	make -C dist/src/"$_project"
 }
 
@@ -65,11 +69,11 @@ scripts() {
 	depends="$pkgname python3 py3-lxc"
 
 	cd "$builddir"
-	install -Dm755 scripts/lxc-to-lxd \
+	install -Dm755 dist/bin/lxc-to-lxd \
 		"$subpkgdir/usr/sbin/lxc-to-lxd"
 }
 
-sha512sums="82c37e87d75e328a29b1f2876a24fedec43a253bb72f3ea55fa9cdb928d11947eda723a01e758f90ef77ed4492f86ec6dd5f1f88240d05e771d926dfdc9888fb  lxd-3.2.tar.gz
-e2c0c96d0efc33e459cf14365f01d60b73ed03f028d36ca5ea27cd647f5d2a91ec61bcf2723437f7b930aec6ebabac3697e0e3adc6b2918817833c9f182aab49  lxd-dont-go-get.patch
+sha512sums="20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c  lxd-3.8.tar.gz
 bc32c71f2ce10f508433e1e4651c08c18e8a17e9419a7ce391c0f127fc7cf378c665178926b35eae8813e290d9c5eab3ceb605679fd32efdf2cf98a57cee4127  lxd.confd
-94de0c0d5ab63463a929a4151359950b1117d0ada5ccf0944311cc70c6b6d4c437ccb4158734ab35db67bfb4abc437074c3f3515be4531f63adc74da21fefb5b  lxd.initd"
+94de0c0d5ab63463a929a4151359950b1117d0ada5ccf0944311cc70c6b6d4c437ccb4158734ab35db67bfb4abc437074c3f3515be4531f63adc74da21fefb5b  lxd.initd
+a77a74950110c94727956457843cd3f64c0db901fb05b95ab0edaa966f7fe76a993d86c8a51d14724a11846a69261199594f683dfefa1db633f4ca35c7f23607  lxd-dont-go-get.patch"
diff --git a/testing/lxd/lxd-dont-go-get.patch b/testing/lxd/lxd-dont-go-get.patch
index 506e56b956..22593ef5ed 100644
--- a/testing/lxd/lxd-dont-go-get.patch
+++ b/testing/lxd/lxd-dont-go-get.patch
@@ -1,18 +1,58 @@
 diff --git a/Makefile b/Makefile
-index 3a0cc01..1d54c9d 100644
+index 99f2aa6..4d79b8b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -13,13 +13,11 @@ TAGS=$(shell test -e /usr/include/sqlite3.h && echo "-tags libsqlite3")
+@@ -15,13 +15,11 @@ ifeq ($(TAG_SQLITE3),)
+ 	exit 1
+ endif
  
- .PHONY: default
- default:
 -	go get -t -v -d ./...
- 	go install -v $(TAGS) $(DEBUG) ./...
+ 	CC=$(CC) go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
  	@echo "LXD built successfully"
  
  .PHONY: client
  client:
 -	go get -t -v -d ./...
- 	go install -v $(TAGS) $(DEBUG) ./lxc
+ 	go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./lxc
  	@echo "LXD client built successfully"
  
+@@ -68,7 +66,6 @@ deps:
+ 
+ .PHONY: update
+ update:
+-	go get -t -v -d -u ./...
+ 	@echo "Dependencies updated"
+ 
+ .PHONY: update-protobuf
+@@ -89,15 +86,11 @@ ifeq ($(TAG_SQLITE3),)
+ 	exit 1
+ endif
+ 
+-	go get -t -v -d ./...
+ 	CC=$(CC) go install -v -tags "$(TAG_SQLITE3) logdebug" $(DEBUG) ./...
+ 	@echo "LXD built successfully"
+ 
+ .PHONY: check
+ check: default
+-	go get -v -x github.com/rogpeppe/godeps
+-	go get -v -x github.com/remyoudompheng/go-misc/deadcode
+-	go get -v -x github.com/golang/lint/golint
+ 	go test -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
+ 	cd test && ./main.sh
+ 
+@@ -113,7 +106,6 @@ dist:
+ 	ln -s ../../../../lxd-$(VERSION) $(TMP)/dist/src/github.com/lxc/lxd
+ 
+ 	# Download dependencies
+-	cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -t -v -d ./...
+ 
+ 	# Download the cluster-enabled sqlite/dqlite
+ 	git clone --depth=1 https://github.com/CanonicalLtd/dqlite $(TMP)/dist/dqlite
+@@ -149,7 +141,6 @@ update-po:
+ 	done
+ 
+ update-pot:
+-	go get -v -x github.com/snapcore/snapd/i18n/xgettext-go/
+ 	xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) --msgid-bugs-address=lxc-devel@lists.linuxcontainers.org --keyword=i18n.G --keyword-plural=i18n.NG lxc/*.go lxc/*/*.go
+ 
+ build-mo: $(MOFILES)