From 3570421f625123be7715a1a5053bc5e132d2a426 Mon Sep 17 00:00:00 2001 From: Jose Bigio Date: Tue, 7 Aug 2018 13:13:02 -0700 Subject: [PATCH] Remove shell directive so target will work Signed-off-by: Jose Bigio Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656 Component: packaging --- components/packaging/deb/Makefile | 2 +- components/packaging/image/Makefile | 4 ++++ components/packaging/rpm/Makefile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index b7c0bd58ed..70402d9802 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -30,7 +30,7 @@ clean: ## remove build artifacts engine-$(ARCH).tar: $(MAKE) -C ../image image-linux - docker save -o $@ $(shell cat ../image/image-linux) + docker save -o $@ $$(cat ../image/image-linux) .PHONY: deb deb: ubuntu debian raspbian ## build all deb packages diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index 1c57451c2b..381093fc70 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -32,6 +32,10 @@ image-linux: $(ENGINE_DIR)/Dockerfile.engine --file $< $(ENGINE_DIR) echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) > $@ +engine-$(ARCH).tar: image-linux + docker save -o $@ $$(cat $<) + + .PHONY: release release: docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index bcad28cfdd..acc39144be 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -42,7 +42,7 @@ centos: centos-7 ## build all centos rpm packages engine-$(ARCH).tar: $(MAKE) -C ../image image-linux - docker save $(shell cat ../image/image-linux) > $@ + docker save -o $@ $$(cat ../image/image-linux) .PHONY: fedora-28 fedora-28: engine-$(ARCH).tar rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-28 rpm packages