github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-26 01:48:36 +00:00
Code Issues Projects Releases Wiki Activity

Rename "tag*" Makefile targets to "build*"

Browse Source 
This better matches the `linuxkit pkg build` nomenclature.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-10-09 16:48:48 +01:00
parent 9bb87c0091
commit 13d11f49ba
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/kubernetes/Makefile
View File

@@ -4,13 +4,13 @@ NETWORK ?= weave-v2.0.4
INIT_YAML ?=
INIT_YAML += network.yaml
all: tag-container-images build-vm-images
all: build-container-images build-vm-images
tag-container-images:
build-container-images:
linuxkit pkg build kubernetes
tag-cache-images:
$(MAKE) -C image-cache tag
build-cache-images:
$(MAKE) -C image-cache build
push-container-images:
linuxkit pkg push kubernetes

14
projects/kubernetes/image-cache/Makefile
View File

@@ -14,17 +14,17 @@ dl/%.tar:
ln $(IMAGES) $${builddir} ; \
$(MAKE) -f Makefile.pkg BUILDDIR=$${builddir} CACHE=$(CACHE) $*
.PHONY: tag-common forcetag-common push-common forcepush-common show-tag-common
tag-common forcetag-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES))
.PHONY: build-common forcebuild-common push-common forcepush-common show-tag-common
build-common forcebuild-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES))
@$(MAKE) CACHE=common IMAGES="$^" $*-pkg
.PHONY: tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane
tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES))
.PHONY: build-control-plane forcebuild-control-plane push-control-plane forcepush-control-plane show-tag-control-plane
build-control-plane forcebuild-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES))
@$(MAKE) CACHE=control-plane IMAGES="$^" $*-pkg
.PHONY: tag push show-tags
tag: tag-common tag-control-plane
forcetag: forcetag-common forcetag-control-plane
.PHONY: build forcebuild push forcepush show-tags
build: build-common build-control-plane
forcebuild: forcebuild-common forcebuild-control-plane
push: push-common push-control-plane
forcepush: forcepush-common forcepush-control-plane
show-tags: show-tag-common show-tag-control-plane