Merge pull request #384 from zelahi/backport-plugins-dir-change

Merged with https://github.com/seemethere/unir
Upstream-commit: 8489bbbc5e136fa67c6cfd0fde3934ef03235a1a
Component: packaging

Author: docker-unir[bot]

components/packaging/deb/Makefile

@@ -2,6 +2,7 @@ include ../common.mk
 
 CLI_DIR:=$(realpath $(CURDIR)/../../cli)
 ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
+PLUGINS_DIR:=$(realpath $(CURDIR)/../plugins)
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
@@ -123,7 +124,7 @@ sources/engine-image:
 
 sources/plugin-installers.tgz: $(wildcard ../plugins/*)
 	docker run --rm -i -w /v \
-		-v $(shell readlink -e ../plugins):/plugins \
+		-v $(PLUGINS_DIR):/plugins \
 		-v $(CURDIR)/sources:/v \
 		alpine \
 		tar -C / -c -z -f /v/plugin-installers.tgz --exclude .git plugins

components/packaging/rpm/Makefile

@@ -2,6 +2,7 @@ include ../common.mk
 
 CLI_DIR:=$(realpath $(CURDIR)/../../cli)
 ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
+PLUGINS_DIR=$(realpath $(CURDIR)/../plugins)
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang
@@ -119,7 +120,7 @@ rpmbuild/SOURCES/distribution_based_engine.json: rpmbuild/SOURCES/engine-image
 
 rpmbuild/SOURCES/plugin-installers.tgz: $(wildcard ../plugins/*)
 	docker run --rm -i -w /v \
-		-v $(shell readlink -e ../plugins):/plugins \
+		-v $(PLUGINS_DIR):/plugins \
 		-v $(CURDIR)/rpmbuild/SOURCES:/v \
 		alpine \
 		tar -C / -c -z -f /v/plugin-installers.tgz --exclude .git plugins