From 3b8cc28c3f75526bcd4875ec8772d8655406e8e2 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 14 Aug 2019 23:27:03 +0200
Subject: [PATCH 1/3] Makefile: set STATIC_VERSION only if empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Makefile        | 2 +-
 deb/Makefile    | 2 +-
 image/Makefile  | 2 +-
 rpm/Makefile    | 2 +-
 static/Makefile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index af113634ef..bef0aab702 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../cli
 VERSION?=0.0.0-dev
 DOCKER_GITCOMMIT:=abcdefg
 ARCH=$(shell uname -m)
-STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
+STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_VERSION:=1.12.8
 DEFAULT_PRODUCT_LICENSE:=Community Engine
 PLATFORM=Docker Engine - Community
diff --git a/deb/Makefile b/deb/Makefile
index 16c99e2612..ee48d899d8 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli
 ENGINE_DIR:=$(CURDIR)/../../engine
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 VERSION?=0.0.0-dev
-STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
+STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
 GO_VERSION:=1.12.8
 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
diff --git a/image/Makefile b/image/Makefile
index 9aff939f51..52a4f9b8b3 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -5,7 +5,7 @@ VERSION?=0.0.0-dev
 GO_BASE_IMAGE=golang
 GO_VERSION:=1.12.8
 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
-STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
+STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 DOCKER_HUB_ORG?=dockereng
 ARCH=$(shell uname -m)
 ENGINE_IMAGE?=engine-community
diff --git a/rpm/Makefile b/rpm/Makefile
index 4e2aef3e45..296631c7f0 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 VERSION?=0.0.0-dev
-STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
+STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
 GO_VERSION:=1.12.8
 GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
diff --git a/static/Makefile b/static/Makefile
index af931b660c..fe0851f2bc 100644
--- a/static/Makefile
+++ b/static/Makefile
@@ -2,7 +2,7 @@ SHELL:=/bin/bash
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 VERSION?=0.0.0-dev
-STATIC_VERSION=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
+STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
 CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
 DIR_TO_HASH:=build/linux

From fe23576b64a9057a4a2d19ec0c71eb34df1f3fe4 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 14 Aug 2019 23:48:38 +0200
Subject: [PATCH 2/3] Makefile: use include for common variables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Makefile        | 15 +++------------
 common.mk       | 12 ++++++++++++
 deb/Makefile    |  6 ++----
 image/Makefile  |  9 ++-------
 rpm/Makefile    |  5 ++---
 static/Makefile |  4 ++--
 6 files changed, 23 insertions(+), 28 deletions(-)
 create mode 100644 common.mk

diff --git a/Makefile b/Makefile
index bef0aab702..8628a3fd41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,8 @@
-SHELL:=/bin/bash
-ENGINE_DIR:=$(CURDIR)/../engine
+include common.mk
+
 CLI_DIR:=$(CURDIR)/../cli
-VERSION?=0.0.0-dev
-DOCKER_GITCOMMIT:=abcdefg
-ARCH=$(shell uname -m)
+ENGINE_DIR:=$(CURDIR)/../engine
 STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
-GO_VERSION:=1.12.8
-DEFAULT_PRODUCT_LICENSE:=Community Engine
-PLATFORM=Docker Engine - Community
-BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
-export DEFAULT_PRODUCT_LICENSE
-export PLATFORM
-export BUILDTIME
 
 # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable
 print-%  : ; @echo $($*)
diff --git a/common.mk b/common.mk
new file mode 100644
index 0000000000..abc222367b
--- /dev/null
+++ b/common.mk
@@ -0,0 +1,12 @@
+ARCH=$(shell uname -m)
+BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
+DEFAULT_PRODUCT_LICENSE:=Community Engine
+DOCKER_GITCOMMIT:=abcdefg
+GO_VERSION:=1.12.8
+PLATFORM=Docker Engine - Community
+SHELL:=/bin/bash
+VERSION?=0.0.0-dev
+
+export BUILDTIME
+export DEFAULT_PRODUCT_LICENSE
+export PLATFORM
diff --git a/deb/Makefile b/deb/Makefile
index ee48d899d8..89b65004b6 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -1,12 +1,10 @@
-SHELL:=/bin/bash
-ARCH:=$(shell uname -m)
+include ../common.mk
+
 CLI_DIR:=$(CURDIR)/../../cli
 ENGINE_DIR:=$(CURDIR)/../../engine
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
-VERSION?=0.0.0-dev
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
-GO_VERSION:=1.12.8
 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
 DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
diff --git a/image/Makefile b/image/Makefile
index 52a4f9b8b3..d660627877 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -1,18 +1,13 @@
-SHELL:=/bin/bash
+include ../common.mk
+
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
-VERSION?=0.0.0-dev
 GO_BASE_IMAGE=golang
-GO_VERSION:=1.12.8
 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 DOCKER_HUB_ORG?=dockereng
-ARCH=$(shell uname -m)
 ENGINE_IMAGE?=engine-community
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
-DEFAULT_PRODUCT_LICENSE?=Community Engine
-PLATFORM?=Docker Engine - Community
-BUILDTIME?=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
 IMAGE_WITH_TAG=$(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION)
 ifdef BASE_IMAGE
 	# TODO: Clean this up to only set ENGINE_GO_IMAGE
diff --git a/rpm/Makefile b/rpm/Makefile
index 296631c7f0..5963dafc76 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -1,11 +1,10 @@
-ARCH=$(shell uname -m)
+include ../common.mk
+
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
-VERSION?=0.0.0-dev
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
-GO_VERSION:=1.12.8
 GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
 GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
 CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
diff --git a/static/Makefile b/static/Makefile
index fe0851f2bc..5192b08cbf 100644
--- a/static/Makefile
+++ b/static/Makefile
@@ -1,12 +1,12 @@
+include ../common.mk
+
 SHELL:=/bin/bash
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
-VERSION?=0.0.0-dev
 STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
 CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
 DIR_TO_HASH:=build/linux
-DEFAULT_PRODUCT_LICENSE?=Community Engine
 GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}')
 DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
 

From 2929c9b1e883db452e8b9014aaa3e085211d0ea8 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 15 Aug 2019 00:22:07 +0200
Subject: [PATCH 3/3] Makefile: realpath engine-, cli-dir

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Makefile        | 4 ++--
 deb/Makefile    | 4 ++--
 image/Makefile  | 4 ++--
 rpm/Makefile    | 4 ++--
 static/Makefile | 5 ++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8628a3fd41..394586831e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include common.mk
 
-CLI_DIR:=$(CURDIR)/../cli
-ENGINE_DIR:=$(CURDIR)/../engine
+CLI_DIR:=$(realpath $(CURDIR)/../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../engine)
 STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 
 # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable
diff --git a/deb/Makefile b/deb/Makefile
index 89b65004b6..315f1f31ef 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-CLI_DIR:=$(CURDIR)/../../cli
-ENGINE_DIR:=$(CURDIR)/../../engine
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
diff --git a/image/Makefile b/image/Makefile
index d660627877..65142ead94 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GO_BASE_IMAGE=golang
 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
diff --git a/rpm/Makefile b/rpm/Makefile
index 5963dafc76..0ca87e7afc 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
diff --git a/static/Makefile b/static/Makefile
index 5192b08cbf..54416ad0c9 100644
--- a/static/Makefile
+++ b/static/Makefile
@@ -1,8 +1,7 @@
 include ../common.mk
 
-SHELL:=/bin/bash
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
 CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files