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

Commit 3a5d16f

Browse files
committed
Makefile: remove SOURCE_FILES, SOURCES variables
We were not currently using these to override, so may as well remove them. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a6a8d77) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: af3fc343165a26a9ae0dc363744d657b0159b025 Component: packaging
1 parent 1807473 commit 3a5d16f

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

components/packaging/deb/Makefile

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

38-
SOURCE_FILES=cli.tgz engine.tgz docker.service docker.socket plugin-installers.tgz
39-
SOURCES=$(addprefix sources/, $(SOURCE_FILES))
40-
4138
DEBIAN_VERSIONS := debian-stretch debian-buster
4239
UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan ubuntu-focal
4340
RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster
@@ -67,7 +64,7 @@ debian: $(DEBIAN_VERSIONS) ## build all debian deb packages
6764
raspbian: $(RASPBIAN_VERSIONS) ## build all raspbian deb packages
6865

6966
.PHONY: $(DISTROS)
70-
$(DISTROS): $(SOURCES)
67+
$(DISTROS): sources/cli.tgz sources/engine.tgz sources/docker.service sources/docker.socket sources/plugin-installers.tgz
7168
@echo "== Building packages for $@ =="
7269
$(BUILD)
7370
$(RUN)

components/packaging/rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fedora: $(FEDORA_RELEASES) ## build all fedora rpm packages
6262
centos: $(CENTOS_RELEASES) ## build all centos rpm packages
6363

6464
.PHONY: $(DISTROS)
65-
$(DISTROS): $(SOURCES)
65+
$(DISTROS): rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/docker.service rpmbuild/SOURCES/docker.socket rpmbuild/SOURCES/plugin-installers.tgz
6666
@echo "== Building packages for $@ =="
6767
$(CHOWN) -R root:root rpmbuild
6868
$(BUILD)

0 commit comments

Comments
 (0)