public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing linux kernel references from vmlinuz to bzImage.

Browse Source 
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
This commit is contained in:
Lluís Batlle i Rossell
2010-02-18 11:34:48 +00:00
parent 89d1b7881f
commit 9bcb6277f3
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/vm/default.nix
+1 -1
View File
@@ -192,7 +192,7 @@ rec {
-nographic -no-reboot \ -nographic -no-reboot \
-net nic,model=virtio -net user -smb / \ -net nic,model=virtio -net user -smb / \
-drive file=$diskImage,if=virtio,boot=on \ -drive file=$diskImage,if=virtio,boot=on \
-kernel ${kernel}/vmlinuz \ -kernel ${kernel}/bzImage \
-initrd ${initrd}/initrd \ -initrd ${initrd}/initrd \
-append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \ -append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \
$QEMU_OPTS $QEMU_OPTS
pkgs/os-specific/linux/kernel/builder.sh
+1 -3
View File
@@ -40,9 +40,7 @@ configurePhase() {
postBuild() { postBuild() {
# After the builder did a 'make all' (kernel + modules) # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/... # we force building the target asked: bzImage/zImage/uImage/...
if [ "$kernelTarget" != "vmlinuz" ]; then make $makeFlags $kernelTarget
make $makeFlags $kernelTarget
fi
} }
installPhase() { installPhase() {
pkgs/top-level/platforms.nix
+1 -1
View File
@@ -7,7 +7,7 @@ with pkgs;
kernelBaseConfig = "defconfig"; kernelBaseConfig = "defconfig";
# Build whatever possible as a module, if not stated in the extra config. # Build whatever possible as a module, if not stated in the extra config.
kernelAutoModules = true; kernelAutoModules = true;
kernelTarget = "vmlinuz"; kernelTarget = "bzImage";
kernelExtraConfig = kernelExtraConfig =
'' ''
# Virtualisation (KVM, Xen...). # Virtualisation (KVM, Xen...).