From d66bc2d501700ca0fdb46d854c3228c20ddb5bbd Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Thu, 26 Jan 2017 11:54:26 -0800 Subject: [PATCH] Split base/ into base/ and tools/ Signed-off-by: Riyaz Faizullabhoy --- docs/hub.md | 2 +- tools/.gitignore | 1 + tools/Makefile | 10 ++++++++++ {base => tools}/c-compile/Dockerfile | 0 {base => tools}/c-compile/Makefile | 0 {base => tools}/c-compile/compile.sh | 0 {base => tools}/check-config/Dockerfile | 0 {base => tools}/check-config/Makefile | 0 {base => tools}/check-kernel-config/Dockerfile | 0 {base => tools}/check-kernel-config/Makefile | 0 .../check-kernel-config/check-kernel-config.sh | 0 {base => tools}/go-compile/Dockerfile | 0 {base => tools}/go-compile/Makefile | 0 {base => tools}/go-compile/compile.sh | 0 {base => tools}/mkimage-gce/Dockerfile | 0 {base => tools}/mkimage-gce/Makefile | 0 {base => tools}/mkimage-gce/make-gce | 0 {base => tools}/mkimage-iso-bios/Dockerfile | 0 {base => tools}/mkimage-iso-bios/Makefile | 0 {base => tools}/mkimage-iso-bios/make-iso | 0 {base => tools}/pad4/Dockerfile | 0 {base => tools}/pad4/Makefile | 0 {base => tools}/pad4/pad4.sh | 0 {base => tools}/perf/.gitignore | 0 {base => tools}/perf/Dockerfile | 0 {base => tools}/perf/Makefile | 0 {base => tools}/perf/README.md | 0 {base => tools}/riddler/Dockerfile | 0 {base => tools}/riddler/Makefile | 0 {base => tools}/riddler/riddler.sh | 0 {base => tools}/tar2initrd/Dockerfile | 0 {base => tools}/tar2initrd/Makefile | 0 {base => tools}/tar2initrd/tar2initrd.sh | 0 {base => tools}/tartar2initrd/Dockerfile | 0 {base => tools}/tartar2initrd/Makefile | 0 {base => tools}/tartar2initrd/tartar2initrd.sh | 0 36 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tools/.gitignore create mode 100644 tools/Makefile rename {base => tools}/c-compile/Dockerfile (100%) rename {base => tools}/c-compile/Makefile (100%) rename {base => tools}/c-compile/compile.sh (100%) rename {base => tools}/check-config/Dockerfile (100%) rename {base => tools}/check-config/Makefile (100%) rename {base => tools}/check-kernel-config/Dockerfile (100%) rename {base => tools}/check-kernel-config/Makefile (100%) rename {base => tools}/check-kernel-config/check-kernel-config.sh (100%) rename {base => tools}/go-compile/Dockerfile (100%) rename {base => tools}/go-compile/Makefile (100%) rename {base => tools}/go-compile/compile.sh (100%) rename {base => tools}/mkimage-gce/Dockerfile (100%) rename {base => tools}/mkimage-gce/Makefile (100%) rename {base => tools}/mkimage-gce/make-gce (100%) rename {base => tools}/mkimage-iso-bios/Dockerfile (100%) rename {base => tools}/mkimage-iso-bios/Makefile (100%) rename {base => tools}/mkimage-iso-bios/make-iso (100%) rename {base => tools}/pad4/Dockerfile (100%) rename {base => tools}/pad4/Makefile (100%) rename {base => tools}/pad4/pad4.sh (100%) rename {base => tools}/perf/.gitignore (100%) rename {base => tools}/perf/Dockerfile (100%) rename {base => tools}/perf/Makefile (100%) rename {base => tools}/perf/README.md (100%) rename {base => tools}/riddler/Dockerfile (100%) rename {base => tools}/riddler/Makefile (100%) rename {base => tools}/riddler/riddler.sh (100%) rename {base => tools}/tar2initrd/Dockerfile (100%) rename {base => tools}/tar2initrd/Makefile (100%) rename {base => tools}/tar2initrd/tar2initrd.sh (100%) rename {base => tools}/tartar2initrd/Dockerfile (100%) rename {base => tools}/tartar2initrd/Makefile (100%) rename {base => tools}/tartar2initrd/tartar2initrd.sh (100%) diff --git a/docs/hub.md b/docs/hub.md index 5e32fe0e1..44cfc18c3 100644 --- a/docs/hub.md +++ b/docs/hub.md @@ -5,7 +5,7 @@ generally with tags based on the image contents. - `mobylinux/alpine-base` the base packages for Moby, before we add Docker and our code and config - `mobylinux/alpine-build-c` for building C code -- `mobylinux/alpine-bios` for building BIOS image +- `mobylinux/mkimage-iso-bios` for building BIOS image - `mobylinux/alpine-efi` for building efi images - `mobylinux/alpine-qemu` for Qemu eg for the tests - `mobylinux/go-compile` for building Go code diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 000000000..b79c9762f --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1 @@ +hash diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 000000000..20c61fb08 --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,10 @@ +DIRS = $(shell find . -type d -depth 1) +.PHONY: clean dirs $(DIRS) + +push: $(DIRS) + +$(DIRS): + $(MAKE) -C $@ + +clean: + rm -f hash diff --git a/base/c-compile/Dockerfile b/tools/c-compile/Dockerfile similarity index 100% rename from base/c-compile/Dockerfile rename to tools/c-compile/Dockerfile diff --git a/base/c-compile/Makefile b/tools/c-compile/Makefile similarity index 100% rename from base/c-compile/Makefile rename to tools/c-compile/Makefile diff --git a/base/c-compile/compile.sh b/tools/c-compile/compile.sh similarity index 100% rename from base/c-compile/compile.sh rename to tools/c-compile/compile.sh diff --git a/base/check-config/Dockerfile b/tools/check-config/Dockerfile similarity index 100% rename from base/check-config/Dockerfile rename to tools/check-config/Dockerfile diff --git a/base/check-config/Makefile b/tools/check-config/Makefile similarity index 100% rename from base/check-config/Makefile rename to tools/check-config/Makefile diff --git a/base/check-kernel-config/Dockerfile b/tools/check-kernel-config/Dockerfile similarity index 100% rename from base/check-kernel-config/Dockerfile rename to tools/check-kernel-config/Dockerfile diff --git a/base/check-kernel-config/Makefile b/tools/check-kernel-config/Makefile similarity index 100% rename from base/check-kernel-config/Makefile rename to tools/check-kernel-config/Makefile diff --git a/base/check-kernel-config/check-kernel-config.sh b/tools/check-kernel-config/check-kernel-config.sh similarity index 100% rename from base/check-kernel-config/check-kernel-config.sh rename to tools/check-kernel-config/check-kernel-config.sh diff --git a/base/go-compile/Dockerfile b/tools/go-compile/Dockerfile similarity index 100% rename from base/go-compile/Dockerfile rename to tools/go-compile/Dockerfile diff --git a/base/go-compile/Makefile b/tools/go-compile/Makefile similarity index 100% rename from base/go-compile/Makefile rename to tools/go-compile/Makefile diff --git a/base/go-compile/compile.sh b/tools/go-compile/compile.sh similarity index 100% rename from base/go-compile/compile.sh rename to tools/go-compile/compile.sh diff --git a/base/mkimage-gce/Dockerfile b/tools/mkimage-gce/Dockerfile similarity index 100% rename from base/mkimage-gce/Dockerfile rename to tools/mkimage-gce/Dockerfile diff --git a/base/mkimage-gce/Makefile b/tools/mkimage-gce/Makefile similarity index 100% rename from base/mkimage-gce/Makefile rename to tools/mkimage-gce/Makefile diff --git a/base/mkimage-gce/make-gce b/tools/mkimage-gce/make-gce similarity index 100% rename from base/mkimage-gce/make-gce rename to tools/mkimage-gce/make-gce diff --git a/base/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile similarity index 100% rename from base/mkimage-iso-bios/Dockerfile rename to tools/mkimage-iso-bios/Dockerfile diff --git a/base/mkimage-iso-bios/Makefile b/tools/mkimage-iso-bios/Makefile similarity index 100% rename from base/mkimage-iso-bios/Makefile rename to tools/mkimage-iso-bios/Makefile diff --git a/base/mkimage-iso-bios/make-iso b/tools/mkimage-iso-bios/make-iso similarity index 100% rename from base/mkimage-iso-bios/make-iso rename to tools/mkimage-iso-bios/make-iso diff --git a/base/pad4/Dockerfile b/tools/pad4/Dockerfile similarity index 100% rename from base/pad4/Dockerfile rename to tools/pad4/Dockerfile diff --git a/base/pad4/Makefile b/tools/pad4/Makefile similarity index 100% rename from base/pad4/Makefile rename to tools/pad4/Makefile diff --git a/base/pad4/pad4.sh b/tools/pad4/pad4.sh similarity index 100% rename from base/pad4/pad4.sh rename to tools/pad4/pad4.sh diff --git a/base/perf/.gitignore b/tools/perf/.gitignore similarity index 100% rename from base/perf/.gitignore rename to tools/perf/.gitignore diff --git a/base/perf/Dockerfile b/tools/perf/Dockerfile similarity index 100% rename from base/perf/Dockerfile rename to tools/perf/Dockerfile diff --git a/base/perf/Makefile b/tools/perf/Makefile similarity index 100% rename from base/perf/Makefile rename to tools/perf/Makefile diff --git a/base/perf/README.md b/tools/perf/README.md similarity index 100% rename from base/perf/README.md rename to tools/perf/README.md diff --git a/base/riddler/Dockerfile b/tools/riddler/Dockerfile similarity index 100% rename from base/riddler/Dockerfile rename to tools/riddler/Dockerfile diff --git a/base/riddler/Makefile b/tools/riddler/Makefile similarity index 100% rename from base/riddler/Makefile rename to tools/riddler/Makefile diff --git a/base/riddler/riddler.sh b/tools/riddler/riddler.sh similarity index 100% rename from base/riddler/riddler.sh rename to tools/riddler/riddler.sh diff --git a/base/tar2initrd/Dockerfile b/tools/tar2initrd/Dockerfile similarity index 100% rename from base/tar2initrd/Dockerfile rename to tools/tar2initrd/Dockerfile diff --git a/base/tar2initrd/Makefile b/tools/tar2initrd/Makefile similarity index 100% rename from base/tar2initrd/Makefile rename to tools/tar2initrd/Makefile diff --git a/base/tar2initrd/tar2initrd.sh b/tools/tar2initrd/tar2initrd.sh similarity index 100% rename from base/tar2initrd/tar2initrd.sh rename to tools/tar2initrd/tar2initrd.sh diff --git a/base/tartar2initrd/Dockerfile b/tools/tartar2initrd/Dockerfile similarity index 100% rename from base/tartar2initrd/Dockerfile rename to tools/tartar2initrd/Dockerfile diff --git a/base/tartar2initrd/Makefile b/tools/tartar2initrd/Makefile similarity index 100% rename from base/tartar2initrd/Makefile rename to tools/tartar2initrd/Makefile diff --git a/base/tartar2initrd/tartar2initrd.sh b/tools/tartar2initrd/tartar2initrd.sh similarity index 100% rename from base/tartar2initrd/tartar2initrd.sh rename to tools/tartar2initrd/tartar2initrd.sh