Change to use kernel not bzImage everywhere

Previously we hardcoded `bzImage` which is not used for all
use cases or architectures.

fix #1630

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

tools/mkimage-gcp/make-gcp

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/image
 cd /tmp/image
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is a compressed tarball of a raw disk image on stdout
 
 mkdir -p files
@@ -17,10 +17,10 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name bzImage)"
+KERNEL="$(find . -name kernel -or -name bzImage)"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64
+[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
@@ -31,7 +31,7 @@ GCP_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 vsyscall=emulate page_
 
 CFG="DEFAULT linux
 LABEL linux
-    KERNEL /vmlinuz64
+    KERNEL /kernel
     INITRD /initrd.img
     APPEND ${CMDLINE}
 "

tools/mkimage-iso-bios/make-iso

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/iso
 cd /tmp/iso
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is an iso on stdout
 
 # extract. BSD tar auto recognises compression, unlike GNU tar
@@ -13,10 +13,10 @@ cd /tmp/iso
 [ -t 0 ] || bsdtar xzf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name bzImage)"
+KERNEL="$(find . -name kernel -or -name '*bzImage')"
 CMDLINE="$*"
 
-[ "$KERNEL" = "vmlinuz64" ] || mv "$KERNEL" vmlinuz64
+[ "$KERNEL" = "kernel" ] || mv "$KERNEL" kernel
 [ "$INITRD" = "initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
@@ -28,7 +28,7 @@ cp /usr/share/syslinux/ldlinux.c32 ./isolinux/
 
 CFG="DEFAULT linux
 LABEL linux
-    KERNEL /vmlinuz64
+    KERNEL /kernel
     INITRD /initrd.img
     APPEND ${CMDLINE}
 "

tools/mkimage-iso-efi/make-efi

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/efi
 cd /tmp/efi
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is an iso on stdout
 
 # extract. BSD tar auto recognises compression, unlike GNU tar
@@ -13,11 +13,11 @@ cd /tmp/efi
 [ -t 0 ] || bsdtar xzf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name bzImage)"
+KERNEL="$(find . -name kernel -or -name bzImage)"
 CMDLINE="$*"
 
-[ "$KERNEL" = "vmlinuz64" ] || mv "$KERNEL" vmlinuz64
-[ "$INITRD" = "initrd.img" ] || mv "$INITRD" initrd.img
+[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
+[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
 find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
@@ -30,8 +30,8 @@ echo "${CMDLINE} rootdelay=300 noautodetect" > cmdline.txt
 objcopy \
 	--add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
 	--add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \
-	--add-section .linux=./vmlinuz64 --change-section-vma .linux=0x40000 \
-	--add-section .initrd=initrd.img --change-section-vma .initrd=0x3000000 \
+	--add-section .linux=./kernel --change-section-vma .linux=0x40000 \
+	--add-section .initrd=./initrd.img --change-section-vma .initrd=0x3000000 \
 	./linuxx64.efi.stub \
 	linuxkit.efi
 

tools/mkimage-qcow/make-qcow

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/image
 cd /tmp/image
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is a qcow2 on stdout
 
 mkdir -p files
@@ -17,10 +17,10 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')"
+KERNEL="$(find . -name kernel -or -name '*bzImage')"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64
+[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
@@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
 
 CFG="DEFAULT linux
 LABEL linux
-    KERNEL /vmlinuz64
+    KERNEL /kernel
     INITRD /initrd.img
     APPEND ${CMDLINE}
 "

tools/mkimage-vhd/make-vhd

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/image
 cd /tmp/image
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is a vhd on stdout
 
 mkdir -p files
@@ -17,10 +17,10 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')"
+KERNEL="$(find . -name kernel -or -name '*bzImage')"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64
+[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
@@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
 
 CFG="DEFAULT linux
 LABEL linux
-    KERNEL /vmlinuz64
+    KERNEL /kernel
     INITRD /initrd.img
     APPEND ${CMDLINE}
 "

tools/mkimage-vmdk/make-vmdk

@@ -5,7 +5,7 @@ set -e
 mkdir -p /tmp/image
 cd /tmp/image
 
-# input is a tarball of vmlinuz64 and initrd.img on stdin
+# input is a tarball of kernel and initrd.img on stdin
 # output is a vmdk on stdout
 
 mkdir -p files
@@ -17,10 +17,10 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')"
+KERNEL="$(find . -name kernel -or -name '*bzImage')"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64
+[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
@@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
 
 CFG="DEFAULT linux
 LABEL linux
-    KERNEL /vmlinuz64
+    KERNEL /kernel
     INITRD /initrd.img
     APPEND ${CMDLINE}
 "