sts-sponsors team mailing list archive

[Anton Troyanov <mp+442896@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:fix-packaging-tarball into maas:master.

Commit message:
fix(systest): explicit vendor in packaging-tarball

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442896
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/Makefile b/Makefile
index 1652997..0d6d9d2 100644
--- a/Makefile
+++ b/Makefile
@@ -328,8 +328,6 @@ packaging-dir := maas_$(packaging-version)
 packaging-orig-tar := $(packaging-dir).orig.tar
 packaging-orig-targz := $(packaging-dir).orig.tar.gz
 
-go-bins-vendor := src/host-info/vendor
-
 $(packaging-build-area):
 	mkdir -p $@
 
@@ -353,7 +351,10 @@ endif
 	tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(UI_BUILD) $(OFFLINE_DOCS) \
 		--transform 's,^,$(packaging-dir)/,'
 	$(MAKE) -C src/host-info vendor
-	tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(go-bins-vendor) \
+	tar -rf $(packaging-build-area)/$(packaging-orig-tar) src/host-info/vendor \
+		--transform 's,^,$(packaging-dir)/,'
+	$(MAKE) -C src/maasagent vendor
+	tar -rf $(packaging-build-area)/$(packaging-orig-tar) src/maasagent/vendor \
 		--transform 's,^,$(packaging-dir)/,'
 	gzip -f $(packaging-build-area)/$(packaging-orig-tar)
 .PHONY: -packaging-tarball
diff --git a/src/maasagent/Makefile b/src/maasagent/Makefile
index 96afca0..66c69ab 100644
--- a/src/maasagent/Makefile
+++ b/src/maasagent/Makefile
@@ -3,7 +3,8 @@ SHELL := /bin/bash
 BIN_DIR := bin
 BUILD_DIR := build
 
-GO := go # override to use alternative Go binary
+# override to use alternative Go binary
+GO := go
 VENDOR_DIR := vendor
 
 LDFLAGS := -ldflags '-s -w -extldflags "-static"'