From 474c06b93623c0d7cfa3ac9540e8567cdba0eb3e Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 14 May 2018 22:42:03 +0000 Subject: [PATCH] Make DOCKER_BUILD_PKGS reflective The hardcoded values make it so that we have to update this everytime we add/subtract something which is sometimes followed/not followed. This makes it so that we no longer have to update this. Signed-off-by: Eli Uriegas Upstream-commit: 04ec3b020edc79830c5a0100790f5bb6686d8efc Component: packaging --- components/packaging/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index ce00a7bb61..67027315cd 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -15,14 +15,14 @@ clean: ## remove build artifacts $(MAKE) -C static clean .PHONY: rpm -rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 centos-7 +rpm: DOCKER_BUILD_PKGS:=$(shell find rpm -type d | grep ".*-.*" | sed 's/^rpm\///') rpm: ## build rpm packages for p in $(DOCKER_BUILD_PKGS); do \ $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ done .PHONY: deb -deb: DOCKER_BUILD_PKGS:=ubuntu-xenial ubuntu-trusty debian-buster debian-stretch debian-wheezy debian-jessie raspbian-stretch raspbian-jessie +deb: DOCKER_BUILD_PKGS:=$(shell find deb -type d | grep ".*-.*" | sed 's/^deb\///') deb: ## build deb packages for p in $(DOCKER_BUILD_PKGS); do \ $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \