From 591f85d1f116064190b2845346ff80971d0d624b Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Mon, 8 Apr 2019 13:31:08 +0200 Subject: [PATCH] Add PLATFORM to deb and rpm build Signed-off-by: Stefan Scherer (cherry picked from commit 119bb518ff5bf382b29971805f5c7ba16f960b21) Upstream-commit: 6d0273d5c0ffd30c3cefd9caca61595f235dc01e Component: packaging --- components/packaging/deb/Makefile | 1 + components/packaging/rpm/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index dc9577c944..c6bfc5a671 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -29,6 +29,7 @@ RUN=docker run --rm -i \ -e DEB_VERSION=$(word 1, $(DEB_VERSION)) \ -e VERSION=$(word 2, $(DEB_VERSION)) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ + -e PLATFORM \ -v $(CURDIR)/debbuild/$@:/build \ debbuild-$@/$(ARCH) diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index fdffe24b21..8de1fb1944 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -28,7 +28,8 @@ BUILD?=docker build \ SPEC_FILES?=docker-ce.spec docker-ce-cli.spec SPECS?=$(addprefix SPECS/, $(SPEC_FILES)) -RPMBUILD=docker run --privileged --rm -i\ +RPMBUILD=docker run --privileged --rm -i \ + -e PLATFORM \ -v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES \ -v $(CURDIR)/rpmbuild/RPMS:/root/rpmbuild/RPMS \ -v $(CURDIR)/rpmbuild/SRPMS:/root/rpmbuild/SRPMS