From 13d11f49bac5ac6d286a127dbff88c57291d6465 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 16:48:48 +0100 Subject: [PATCH] Rename "tag*" Makefile targets to "build*" This better matches the `linuxkit pkg build` nomenclature. Signed-off-by: Ian Campbell --- Makefile | 6 +++--- kernel/Makefile | 2 +- pkg/Makefile | 6 +++--- projects/kubernetes/Makefile | 8 ++++---- projects/kubernetes/image-cache/Makefile | 14 +++++++------- test/pkg/Makefile | 6 +++--- tools/Makefile | 6 +++--- tools/alpine/Makefile | 4 ++-- tools/guestfs/Makefile | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 876883efe..973d81de1 100644 --- a/Makefile +++ b/Makefile @@ -94,19 +94,19 @@ ci: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all - $(MAKE) -C pkg tag + $(MAKE) -C pkg build ci-tag: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all - $(MAKE) -C pkg tag + $(MAKE) -C pkg build ci-pr: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test pr - $(MAKE) -C pkg tag + $(MAKE) -C pkg build .PHONY: clean clean: diff --git a/kernel/Makefile b/kernel/Makefile index ed015b23d..af40c4e9c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -63,7 +63,7 @@ endif KERNEL_VERSIONS= -.PHONY: check tag push +.PHONY: check build push # Targets: # fetch: Downloads the kernel sources into ./sources # build: Builds all kernels diff --git a/pkg/Makefile b/pkg/Makefile index cc311ac95..1676f7675 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,5 +1,5 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) -.PHONY: push force-push tag forcetag show-tag clean +.PHONY: push force-push build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -7,10 +7,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index a34225572..277d753a2 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -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 diff --git a/projects/kubernetes/image-cache/Makefile b/projects/kubernetes/image-cache/Makefile index c094bcc50..538f06306 100644 --- a/projects/kubernetes/image-cache/Makefile +++ b/projects/kubernetes/image-cache/Makefile @@ -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 diff --git a/test/pkg/Makefile b/test/pkg/Makefile index ad8d69aaf..614658aa5 100644 --- a/test/pkg/Makefile +++ b/test/pkg/Makefile @@ -1,5 +1,5 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) -.PHONY: push forcepush tag forcetag show-tag clean +.PHONY: push forcepush build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -7,10 +7,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/tools/Makefile b/tools/Makefile index 145f1d79c..57eb9542d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -4,7 +4,7 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) # Note that these are only recursed on for the push target which was the historical behaviour. MAKEDIRS = alpine guestfs -.PHONY: push forcepush tag forcetag show-tag clean +.PHONY: push forcepush build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -13,10 +13,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile index 38e662cea..88695a8e3 100644 --- a/tools/alpine/Makefile +++ b/tools/alpine/Makefile @@ -1,4 +1,4 @@ -.PHONY: tag push +.PHONY: build push ORG?=linuxkit IMAGE=alpine @@ -61,7 +61,7 @@ push: hash iid versions.$(ARCH) ./push-manifest.sh $(ORG) $(IMAGE) rm -f iid -tag: hash iid versions.$(ARCH) +build: hash iid versions.$(ARCH) docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ docker tag $(shell cat iid) $(ORG)/$(IMAGE):$(shell cat hash) rm -f iid diff --git a/tools/guestfs/Makefile b/tools/guestfs/Makefile index 0813f0dde..4bab51172 100644 --- a/tools/guestfs/Makefile +++ b/tools/guestfs/Makefile @@ -1,4 +1,4 @@ -.PHONY: tag push +.PHONY: build push IMAGE=guestfs @@ -18,7 +18,7 @@ push: hash iid docker push linuxkit/$(IMAGE):$(shell cat hash)) rm -f iid -tag: hash iid +build: hash iid docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker tag $(shell cat iid) linuxkit/$(IMAGE):$(shell cat hash) rm -f iid