github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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:

2
kernel/Makefile
View File

@ -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

6
pkg/Makefile
View File

@ -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:

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

6
test/pkg/Makefile
View File

@ -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:

6
tools/Makefile
View File

@ -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:

4
tools/alpine/Makefile
View File

@ -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

4
tools/guestfs/Makefile
View File

@ -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