The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2432
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) ===
We only want LXD's own test dependencies, not the ones for every single
package we use.
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 227b2a7ef5ed68afaf708e0678d1533bcb3d5d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Wed, 28 Sep 2016 01:27:52 -0400
Subject: [PATCH] Makefile: Don't recursively include test deps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We only want LXD's own test dependencies, not the ones for every single
package we use.
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
Makefile | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 487f512..5d0d2c5 100644
--- a/Makefile
+++ b/Makefile
@@ -55,18 +55,20 @@ gccgo:
.PHONY: dist
dist:
+ $(eval TMP := $(shell mktemp -d))
rm -Rf lxd-$(VERSION) $(ARCHIVE) $(ARCHIVE).gz
- mkdir -p lxd-$(VERSION)/dist
- -GOPATH=$(shell pwd)/lxd-$(VERSION)/dist go get -t -v -d ./...
- -GOPATH=$(shell pwd)/lxd-$(VERSION)/dist go get -t -v -d ./...
- -GOPATH=$(shell pwd)/lxd-$(VERSION)/dist go get -t -v -d ./...
- GOPATH=$(shell pwd)/lxd-$(VERSION)/dist go get -t -v -d ./...
- rm -rf $(shell pwd)/lxd-$(VERSION)/dist/src/github.com/lxc/lxd
- ln -s ../../../.. ./lxd-$(VERSION)/dist/src/github.com/lxc/lxd
+ mkdir -p lxd-$(VERSION)/
+ -GOPATH=$(TMP) go get -t -v -d ./...
+ -GOPATH=$(TMP) go get -t -v -d ./...
+ -GOPATH=$(TMP) go get -t -v -d ./...
+ GOPATH=$(TMP) go get -t -v -d ./...
+ rm -rf $(TMP)/src/github.com/lxc/lxd
+ ln -s ../../../.. $(TMP)/src/github.com/lxc/lxd
+ mv $(TMP)/ lxd-$(VERSION)/dist
git archive --prefix=lxd-$(VERSION)/ --output=$(ARCHIVE) HEAD
tar -uf $(ARCHIVE) --exclude-vcs lxd-$(VERSION)/
gzip -9 $(ARCHIVE)
- rm -Rf dist lxd-$(VERSION) $(ARCHIVE)
+ rm -Rf lxd-$(VERSION) $(ARCHIVE)
.PHONY: i18n update-po update-pot build-mo static-analysis
i18n: update-pot
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
