From 92d664086db81f454b8c5ccc94df09d39991d361 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 24 May 2017 10:11:40 -0700 Subject: [PATCH 1/3] Make the hash_files target non interactive Signed-off-by: Eli Uriegas Upstream-commit: 097516fc76a2c9acf798dc523326904520ff1fc7 Component: packaging --- components/packaging/static/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile index 1c8d25d952..57d51851ea 100644 --- a/components/packaging/static/Makefile +++ b/components/packaging/static/Makefile @@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli ENGINE_VER=$(shell cat $(ENGINE_DIR)/VERSION) VERSION=$(shell cat $(ENGINE_DIR)/VERSION) CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown -HASH_CMD=docker run -v $(CURDIR):/sum -it -w /sum debian:jessie bash hash_files +HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux .PHONY: help clean static static-linux cross-mac cross-win cross-arm static-cli static-engine cross-all-cli cross-win-engine hash_files From a88dc6ffda360fec2bdd111dadc37ddce22085e7 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Thu, 25 May 2017 05:22:42 +0000 Subject: [PATCH 2/3] override ver and git commit when building all deb pkgs Signed-off-by: Andrew Hsu Upstream-commit: 4397990e00863254d78c44fbe904a70272b5b340 Component: packaging --- components/packaging/deb/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 4ba94a32ab..82bbb248f8 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -47,6 +47,8 @@ ubuntu-trusty: ## build ubuntu trusty deb packages ubuntu-yakkety: ## build ubuntu yakkety deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ @@ -56,6 +58,8 @@ ubuntu-yakkety: ## build ubuntu yakkety deb packages ubuntu-zesty: ## build ubuntu zesty deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ @@ -65,6 +69,8 @@ ubuntu-zesty: ## build ubuntu zesty deb packages debian-jessie: ## build debian jessie deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ @@ -74,6 +80,8 @@ debian-jessie: ## build debian jessie deb packages debian-stretch: ## build debian stretch deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ @@ -83,6 +91,8 @@ debian-stretch: ## build debian stretch deb packages debian-wheezy: ## build debian wheezy deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ From 680164099ab5e786aabc6930092a8618f3b095ff Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Thu, 25 May 2017 05:57:29 +0000 Subject: [PATCH 3/3] pass in git commit override when building deb Signed-off-by: Andrew Hsu Upstream-commit: 3c70b56937c415c6bf3516aeaa5231c6d7d3145d Component: packaging --- components/packaging/deb/common/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/common/rules b/components/packaging/deb/common/rules index d098e3a816..74f4b7c8d9 100644 --- a/components/packaging/deb/common/rules +++ b/components/packaging/deb/common/rules @@ -12,7 +12,7 @@ override_dh_gencontrol: override_dh_auto_build: cd engine && ./hack/make.sh dynbinary - cd cli && LDFLAGS="" make VERSION=$(VERSION) dynbinary + cd cli && LDFLAGS='' make VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary # ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here override_dh_auto_test: