From 2645463a176efc0cca0c594c731b789e7d4ac17f Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Mon, 13 Aug 2018 23:26:59 +0000
Subject: [PATCH] Remove engine-$(ARCH).tar dependency for now

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 111b5babb924137df28c233ac40c23f7553a39da
Component: packaging
---
 components/packaging/deb/Makefile | 16 ++++++++--------
 components/packaging/rpm/Makefile | 10 +++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile
index 70402d9802..0e35082c01 100644
--- a/components/packaging/deb/Makefile
+++ b/components/packaging/deb/Makefile
@@ -45,49 +45,49 @@ debian: debian-stretch debian-jessie ## build all debian deb packages
 raspbian: raspbian-stretch debian-jessie ## build all raspbian deb packages
 
 .PHONY: ubuntu-xenial
-ubuntu-xenial: engine-$(ARCH).tar ## build ubuntu xenial deb packages
+ubuntu-xenial: ## build ubuntu xenial deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: ubuntu-trusty
-ubuntu-trusty: engine-$(ARCH).tar ## build ubuntu trusty deb packages
+ubuntu-trusty: ## build ubuntu trusty deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: ubuntu-bionic
-ubuntu-bionic: engine-$(ARCH).tar ## build ubuntu bionic deb packages
+ubuntu-bionic: ## build ubuntu bionic deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: debian-buster
-debian-buster: engine-$(ARCH).tar ## build debian buster deb packages
+debian-buster: ## build debian buster deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: debian-jessie
-debian-jessie: engine-$(ARCH).tar ## build debian jessie deb packages
+debian-jessie: ## build debian jessie deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: debian-stretch
-debian-stretch: engine-$(ARCH).tar ## build debian stretch deb packages
+debian-stretch: ## build debian stretch deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: raspbian-jessie
-raspbian-jessie: engine-$(ARCH).tar ## build raspbian jessie deb packages
+raspbian-jessie: ## build raspbian jessie deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
 
 .PHONY: raspbian-stretch
-raspbian-stretch: engine-$(ARCH).tar ## build raspbian stretch deb packages
+raspbian-stretch: ## build raspbian stretch deb packages
 	$(BUILD)
 	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile
index 3bf1ad5e1a..a9fd0eb779 100644
--- a/components/packaging/rpm/Makefile
+++ b/components/packaging/rpm/Makefile
@@ -35,24 +35,20 @@ fedora: fedora-28 fedora-27 fedora-26 ## build all fedora rpm packages
 .PHONY: centos
 centos: centos-7 ## build all centos rpm packages
 
-engine-$(ARCH).tar:
-	$(MAKE) -C ../image image-linux
-	docker save -o $@ $$(cat ../image/image-linux) 
-
 .PHONY: fedora-28
-fedora-28: engine-$(ARCH).tar rpmbuild/SOURCES/cli.tgz ## build fedora-28 rpm packages
+fedora-28: rpmbuild/SOURCES/cli.tgz ## build fedora-28 rpm packages
 	docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) .
 	$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
 
 .PHONY: fedora-27
-fedora-27: engine-$(ARCH).tar rpmbuild/SOURCES/cli.tgz ## build fedora-27 rpm packages
+fedora-27: rpmbuild/SOURCES/cli.tgz ## build fedora-27 rpm packages
 	docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) .
 	$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
 
 .PHONY: centos-7
-centos-7: engine-$(ARCH).tar rpmbuild/SOURCES/cli.tgz ## build centos-7 rpm packages
+centos-7: rpmbuild/SOURCES/cli.tgz ## build centos-7 rpm packages
 	docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) .
 	$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild