diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-18 11:34:48 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-18 11:34:48 +0000 |
| commit | 9bcb6277f3bb97340673cae70fbe17561fbd88a0 (patch) | |
| tree | 6ad1fb548c2a94d727c6a7e4fa9e769a5fe6a6bb /pkgs | |
| parent | 89d1b7881f707c1a374af77eef7deae333c27476 (diff) | |
| download | nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar.gz nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar.bz2 nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar.lz nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar.xz nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.tar.zst nixlib-9bcb6277f3bb97340673cae70fbe17561fbd88a0.zip | |
Changing linux kernel references from vmlinuz to bzImage.
This way we get a simpler kernel build script. svn path=/nixpkgs/trunk/; revision=20094
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/top-level/platforms.nix | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7870f987fafa..64fb1d354208 100644 --- a/pkgs/build-support/vm/default.nix +++ b/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 diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 48e173e1baa2..75283e835de5 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/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() { diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 81ef7764b152..8bbb3ae56a8d 100644 --- a/pkgs/top-level/platforms.nix +++ b/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...). |