Convert most of tools/* to linuxkit pkg build

tools/alpine and tools/guestfs are omitted since they do not currently use
pkg/package.mk and do their own thing. Slightly hacky arrangements are made for
these. Note that previously they were only recursed into for their default
target (push) and that behaviour is retained.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-09 14:49:47 +01:00
parent f7c50156c5
commit 624e7c82f1
17 changed files with 23 additions and 41 deletions

View File

@ -1,19 +1,25 @@
DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml))
# These have more complex builds which have not yet been ported to linuxkit pkg.
# No more entries should be added to this list.
# 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
push:
@set -e; for d in $(DIRS); do make -C "$$d" push; done
@set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done
@set -e; for d in $(MAKEDIRS); do make -C "$$d" push; done
forcepush:
@set -e; for d in $(DIRS); do make -C "$$d" forcepush; done
@set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done
tag:
@set -e; for d in $(DIRS); do make -C "$$d" tag; done
@set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done
forcetag:
@set -e; for d in $(DIRS); do make -C "$$d" forcetag; done
@set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done
show-tag:
@set -e; for d in $(DIRS); do make -C "$$d" show-tag; done
@set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done
clean:

View File

@ -1,5 +0,0 @@
IMAGE=go-compile
DEPS=compile.sh
include ../../pkg/package.mk

View File

@ -0,0 +1 @@
image: go-compile

View File

@ -1,4 +0,0 @@
IMAGE=mkimage-dynamic-vhd
DEPS=make-dynamic-vhd
include ../../pkg/package.mk

View File

@ -0,0 +1 @@
image: mkimage-dynamic-vhd

View File

@ -1,4 +0,0 @@
IMAGE=mkimage-gcp
DEPS=make-gcp
include ../../pkg/package.mk

View File

@ -0,0 +1 @@
image: mkimage-gcp

View File

@ -1,5 +0,0 @@
IMAGE=mkimage-iso-bios
DEPS=make-iso
ARCHES=x86_64
include ../../pkg/package.mk

View File

@ -0,0 +1,3 @@
image: mkimage-iso-bios
arches:
- amd64

View File

@ -1,5 +0,0 @@
IMAGE=mkimage-iso-efi
DEPS=make-efi
NETWORK=1
include ../../pkg/package.mk

View File

@ -0,0 +1,2 @@
image: mkimage-iso-efi
network: true

View File

@ -1,4 +0,0 @@
IMAGE=mkimage-vhd
DEPS=make-vhd
include ../../pkg/package.mk

View File

@ -0,0 +1 @@
image: mkimage-vhd

View File

@ -1,4 +0,0 @@
IMAGE=mkimage-vmdk
DEPS=make-vmdk
include ../../pkg/package.mk

View File

@ -0,0 +1 @@
image: mkimage-vmdk

View File

@ -1,4 +0,0 @@
IMAGE=qemu
include ../../pkg/package.mk

1
tools/qemu/build.yml Normal file
View File

@ -0,0 +1 @@
image: qemu