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

* Get User-Mode Linux to build with a newer kernel. Yes, SHELL really 

has to be "/bin/sh" - other values such as "sh" or "bash" or "$(type
  -tP sh)" cause a build error:

  LD      .tmp_vmlinux1
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: ignoring invalid character `#' in expression
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: syntax error
  collect2: ld returned 1 exit status

  This is caused by Bash 4.0
  (http://bugzilla.kernel.org/show_bug.cgi?id=13343).

svn path=/nixpkgs/branches/kernel-config/; revision=18941
This commit is contained in:
Eelco Dolstra 2009-12-14 17:22:38 +00:00
parent 03b4efe9c8
commit c3e80cbc9f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/builder.sh
View File

@ -1,7 +1,7 @@
source $stdenv/setup source $stdenv/setup
makeFlags="ARCH=$arch" makeFlags="ARCH=$arch SHELL=/bin/sh"
configurePhase() { configurePhase() {

4
pkgs/os-specific/linux/kernel/generate-config.pl
View File

@ -128,7 +128,9 @@ while (<CONFIG>) {
close CONFIG; close CONFIG;
foreach my $name (sort (keys %answers)) { foreach my $name (sort (keys %answers)) {
my $f = $requiredAnswers{$name} ? sub { die @_; } : sub { warn @_; }; my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1"
? sub { die @_; } : sub { warn @_; };
my $f = sub { warn @_; };
&$f("unused option: $name\n") unless defined $config{$name}; &$f("unused option: $name\n") unless defined $config{$name};
&$f("option not set correctly: $name\n") &$f("option not set correctly: $name\n")
if $config{$name} && $config{$name} ne $answers{$name}; if $config{$name} && $config{$name} ne $answers{$name};

3
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -66,6 +66,9 @@ stdenv.mkDerivation {
map ({extraConfig ? "", ...}: extraConfig) kernelPatches; map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
in lib.concatStringsSep "\n" ([config] ++ configFromPatches); in lib.concatStringsSep "\n" ([config] ++ configFromPatches);
# For UML, just ignore all options that don't apply (I'm lazy).
ignoreConfigErrors = userModeLinux;
buildInputs = [ perl mktemp ]; buildInputs = [ perl mktemp ];
arch = arch =