diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-27 15:43:27 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-27 15:43:27 +0000 |
commit | e04beb262ee13b6639fb86594ca22acf3d98c95e (patch) | |
tree | a7535f34ca66e36bc9decf5d7af1a0c125853f95 /pkgs/os-specific | |
parent | e9ff6517b962f852bae06932ae176ed56ec00c00 (diff) |
* Strangely, running "make defconfig" before the generator causes
"make config" to print an additional question that the script doesn't know how to answer ("Audio Excel DSP 16 [N/y] (NEW) ###"). Just ignore it. svn path=/nixpkgs/branches/stdenv-updates/; revision=19713
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/generate-config.pl | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index f756c140c49e4..a67877c9fd6af 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -24,7 +24,7 @@ configurePhase() { # generate-config.pl can answer them. sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c - # Get a basic config file for later refinement with $generateConfig + # Get a basic config file for later refinement with $generateConfig. make $kernelBaseConfig ARCH=$arch # Create the config file. @@ -33,12 +33,14 @@ configurePhase() { DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config perl -w $generateConfig } + postBuild() { if [ "$platformName" == "sheevaplug" ]; then make uImage fi } + installPhase() { ensureDir $out diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index be5118672e3bc..e8f7e6555d33b 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -94,7 +94,8 @@ sub runConfig { } else { - die "don't know how to answer this question: $line\n"; + warn "don't know how to answer this question: $line\n"; + print OUT "\n"; } $line = ""; |