The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4292
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) ===
From a3f668fa0f54ecf8742365574cf1e303ad21d36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]> Date: Wed, 28 Feb 2018 14:54:22 -0500 Subject: [PATCH 1/2] Makefile: Remove Go 1.7 workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber <[email protected]> --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index ae69895b0..5bc2be3ee 100644 --- a/Makefile +++ b/Makefile @@ -72,9 +72,6 @@ dist: # Download dependencies cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -t -v -d ./... - # Workaround for gorilla/mux on Go < 1.7 - cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -v -d github.com/gorilla/context - # Assemble tarball rm $(TMP)/dist/src/github.com/lxc/lxd ln -s ../../../../ $(TMP)/dist/src/github.com/lxc/lxd From dfcddda99b5e4a6255425e81f5025c89b09c4e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]> Date: Wed, 28 Feb 2018 14:56:23 -0500 Subject: [PATCH 2/2] Makefile: Include the custom sqlite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber <[email protected]> --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 5bc2be3ee..337e8db3e 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,11 @@ dist: # Download dependencies cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -t -v -d ./... + # Download the cluster-enabled sqlite + git clone https://github.com/CanonicalLtd/sqlite $(TMP)/dist/sqlite + cd $(TMP)/dist/sqlite && git log -1 --format="format:%ci%n" | sed -e 's/ [-+].*$$//;s/ /T/;s/^/D /' > manifest + cd $(TMP)/dist/sqlite && git log -1 --format="format:%H" > manifest.uuid + # Assemble tarball rm $(TMP)/dist/src/github.com/lxc/lxd ln -s ../../../../ $(TMP)/dist/src/github.com/lxc/lxd
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
