summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-20 13:30:59 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-20 13:30:59 +0000
commitf7d0fcdaac7dc2d60a0d57e90632f20ba36242f5 (patch)
tree657673147459dc5f9e2658fa45003e7049c0388e /pkgs
parentf8f53855d5bd53787ccb1f3360f48dc09e2c30a5 (diff)
downloadnixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar.gz
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar.bz2
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar.lz
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar.xz
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.tar.zst
nixpkgs-f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5.zip
Making the kernel builder accept the 'vmlinux' kerneltarget.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23274
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/builder.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 6055c8c4e5f..bb030abaa6c 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -68,7 +68,8 @@ installPhase() {
     if test "$arch" = um; then
         ensureDir $out/bin
         cp linux $out/bin
-    else
+    elif test "$kernelTarget" != "vmlinux"; then
+        # In any case we copy the 'vmlinux' ELF in the next lines
         cp arch/$archDir/boot/$kernelTarget $out
     fi