Makefile: use include for common variables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fe23576)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 14beb3692f38384d9634599ae95b630771394cf1
Component: packaging

Author: thaJeztah

components/packaging/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 $($*)

components/packaging/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

components/packaging/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

components/packaging/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

components/packaging/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

components/packaging/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)