Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 7ded1b5

Browse files
Merge pull request #503 from thaJeztah/19.03_backport_top_level_distro
[19.03 backport] To allow build for selective distros from top directory. Upstream-commit: d7641de7158fc22158d6f353e4ea40a2b7ec2449 Component: packaging
2 parents 2961931 + 94ab047 commit 7ded1b5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

components/packaging/deb/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ RUN=docker run --rm -i \
3535
$(RUN_FLAGS) \
3636
debbuild-$@/$(ARCH)
3737

38-
DEBIAN_VERSIONS := debian-stretch debian-buster
39-
UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-focal
40-
RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster
38+
DEBIAN_VERSIONS ?= debian-stretch debian-buster
39+
UBUNTU_VERSIONS ?= ubuntu-xenial ubuntu-bionic ubuntu-focal
40+
RASPBIAN_VERSIONS ?= raspbian-stretch raspbian-buster
4141
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
4242

4343
.PHONY: help

components/packaging/rpm/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
4040
SOURCE_FILES=engine.tgz cli.tgz docker.service docker.socket plugin-installers.tgz
4141
SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES))
4242

43-
FEDORA_RELEASES := fedora-32 fedora-31
44-
CENTOS_RELEASES := centos-7 centos-8
45-
RHEL_RELEASES := rhel-7
43+
FEDORA_RELEASES ?= fedora-32 fedora-31
44+
CENTOS_RELEASES ?= centos-7 centos-8
45+
RHEL_RELEASES ?= rhel-7
4646
DISTROS := $(FEDORA_RELEASES) $(CENTOS_RELEASES) $(RHEL_RELEASES)
4747

4848
.PHONY: help

0 commit comments

Comments
 (0)