Changing linux kernel references from vmlinuz to bzImage.

This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094

pkgs/build-support/vm/default.nix

@@ -192,7 +192,7 @@ rec {
       -nographic -no-reboot \
       -net nic,model=virtio -net user -smb / \
       -drive file=$diskImage,if=virtio,boot=on \
-      -kernel ${kernel}/vmlinuz \
+      -kernel ${kernel}/bzImage \
       -initrd ${initrd}/initrd \
       -append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \
       $QEMU_OPTS

pkgs/os-specific/linux/kernel/builder.sh

@@ -40,9 +40,7 @@ configurePhase() {
 postBuild() {
     # After the builder did a 'make all' (kernel + modules)
     # we force building the target asked: bzImage/zImage/uImage/...
-    if [ "$kernelTarget" != "vmlinuz" ]; then
-        make $makeFlags $kernelTarget
-    fi
+    make $makeFlags $kernelTarget
 }
 
 installPhase() {

pkgs/top-level/platforms.nix

@@ -7,7 +7,7 @@ with pkgs;
     kernelBaseConfig = "defconfig";
     # Build whatever possible as a module, if not stated in the extra config.
     kernelAutoModules = true;
-    kernelTarget = "vmlinuz";
+    kernelTarget = "bzImage";
     kernelExtraConfig =
       ''
         # Virtualisation (KVM, Xen...).