From 70d8143e48e8a4d3a0b4121eb2604f8deba6cb0f Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@unikernel.com>
Date: Thu, 17 Dec 2015 15:26:42 +0000
Subject: [PATCH] move kernel under rest of build and pull through aufs tools

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
---
 Makefile                                |  3 +--
 alpine/Dockerfile                       |  2 ++
 alpine/Makefile                         | 10 +++++++---
 {kernel => alpine/kernel}/.gitignore    |  0
 {kernel => alpine/kernel}/Dockerfile    |  0
 {kernel => alpine/kernel}/Makefile      | 10 ++++------
 {kernel => alpine/kernel}/README.md     |  0
 {kernel => alpine/kernel}/kernel_config |  0
 xhyve/xhyverun.sh                       |  2 +-
 9 files changed, 15 insertions(+), 12 deletions(-)
 rename {kernel => alpine/kernel}/.gitignore (100%)
 rename {kernel => alpine/kernel}/Dockerfile (100%)
 rename {kernel => alpine/kernel}/Makefile (52%)
 rename {kernel => alpine/kernel}/README.md (100%)
 rename {kernel => alpine/kernel}/kernel_config (100%)

diff --git a/Makefile b/Makefile
index d34ccfc6e..27c1d2ddf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 all:
-	$(MAKE) -C kernel
+	$(MAKE) -C alpine/kernel
 	$(MAKE) -C alpine
 
 xhyve: all
 	$(MAKE) -C xhyve run
 
 clean:
-	$(MAKE) -C kernel clean
 	$(MAKE) -C alpine clean
 	$(MAKE) -C xhyve clean
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index da7a37a2a..6409a1523 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -14,6 +14,8 @@ RUN \
 
 COPY etc /etc/
 
+ADD kernel/aufs-utils.tar /
+
 COPY mkinitrd.sh /bin/
 
 RUN \
diff --git a/alpine/Makefile b/alpine/Makefile
index bfb7992e6..0819efbb4 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -8,14 +8,18 @@ ETCFILES+=etc/init.d/automount
 ETCFILES+=etc/conf.d/docker
 ETCFILES+=etc/securetty
 
-initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES)
+kernel/aufs-utils.tar:
+	$(MAKE) -C kernel aufs-utils.tar
+
+initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) kernel/aufs-utils.tar
 	rm -f initrd.img
 	$(MAKE) -C packages/9pudc
 	$(MAKE) -C packages/mdnstool
-	docker build -t moby:test .
-	docker run moby:test /bin/mkinitrd.sh > $@
+	docker build -t moby:build .
+	docker run moby:build /bin/mkinitrd.sh > $@
 
 clean:
 	rm -f initrd.img
 	$(MAKE) -C packages/9pudc clean
 	$(MAKE) -C packages/mdnstool clean
+	$(MAKE) -C kernel clean
diff --git a/kernel/.gitignore b/alpine/kernel/.gitignore
similarity index 100%
rename from kernel/.gitignore
rename to alpine/kernel/.gitignore
diff --git a/kernel/Dockerfile b/alpine/kernel/Dockerfile
similarity index 100%
rename from kernel/Dockerfile
rename to alpine/kernel/Dockerfile
diff --git a/kernel/Makefile b/alpine/kernel/Makefile
similarity index 52%
rename from kernel/Makefile
rename to alpine/kernel/Makefile
index 60451bd31..10749587a 100644
--- a/kernel/Makefile
+++ b/alpine/kernel/Makefile
@@ -1,13 +1,11 @@
 all:	vmlinuz64 aufs-utils.tar
 
-kernel: kernel_config Dockerfile
+vmlinuz64: kernel_config Dockerfile
 	docker build -t mobykernel:build .
+	docker run mobykernel:build cat /linux/arch/x86_64/boot/bzImage > $@
 
-vmlinuz64: kernel
-	docker run mobykernel:build cat /linux/arch/x86_64/boot/bzImage > vmlinuz64
-
-aufs-utils.tar: kernel
-	docker run mobykernel:build cat /aufs-utils.tar > aufs-utils.tar
+aufs-utils.tar: vmlinuz64
+	docker run mobykernel:build cat /aufs-utils.tar > $@
 
 clean:
 	rm -f vmlinuz64 aufs-utils.tar
diff --git a/kernel/README.md b/alpine/kernel/README.md
similarity index 100%
rename from kernel/README.md
rename to alpine/kernel/README.md
diff --git a/kernel/kernel_config b/alpine/kernel/kernel_config
similarity index 100%
rename from kernel/kernel_config
rename to alpine/kernel/kernel_config
diff --git a/xhyve/xhyverun.sh b/xhyve/xhyverun.sh
index b3a191025..a641062e9 100755
--- a/xhyve/xhyverun.sh
+++ b/xhyve/xhyverun.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-KERNEL="../kernel/vmlinuz64"
+KERNEL="../alpine/kernel/vmlinuz64"
 INITRD="../alpine/initrd.img"
 CMDLINE="earlyprintk=serial console=ttyS0"