move kernel under rest of build and pull through aufs tools

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>

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

alpine/Dockerfile

@@ -14,6 +14,8 @@ RUN \
 
 COPY etc /etc/
 
+ADD kernel/aufs-utils.tar /
+
 COPY mkinitrd.sh /bin/
 
 RUN \

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

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

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"