summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/generate-config.pl
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-08-06 16:21:46 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-08-06 17:06:45 +0300
commit44f462bf4d2d8878a9206ac0f6eb095cfc48e95f (patch)
tree1d00390a6c70fc26784e216ace01789df014271d /pkgs/os-specific/linux/kernel/generate-config.pl
parent20f009d56df9a0e5f224761ba48aa4142564753e (diff)
downloadnixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar.gz
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar.bz2
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar.lz
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar.xz
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.tar.zst
nixpkgs-44f462bf4d2d8878a9206ac0f6eb095cfc48e95f.zip
generate-config.pl: Be more verbose about missing options
For instance, the current 3.10 kernel build fails at the end with:

unused option: BRCMFMAC_PCIE
unused option: FW_LOADER_USER_HELPER_FALLBACK
unused option: KEXEC_FILE
unused option: RANDOMIZE_BASE

However, it's not obvious that only the _last_ one is actually fatal to
the build. After this change it's at least somewhat better:

warning: unused option: BRCMFMAC_PCIE
warning: unused option: FW_LOADER_USER_HELPER_FALLBACK
warning: unused option: KEXEC_FILE
error: unused option: RANDOMIZE_BASE
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generate-config.pl')
-rw-r--r--pkgs/os-specific/linux/kernel/generate-config.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 20abe1015c3..e5fa780c6e7 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -134,7 +134,7 @@ close CONFIG;
 
 foreach my $name (sort (keys %answers)) {
     my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1"
-        ? sub { die @_; } : sub { warn @_; };
+        ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; };
     &$f("unused option: $name\n") unless defined $config{$name};
     &$f("option not set correctly: $name\n")
         if $config{$name} && $config{$name} ne $answers{$name};