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

linux/manual-config: When installing firmware, create the firmware directory prior to make *_install.

Browse Source 
It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
This commit is contained in:
Shea Levy 2012-08-01 11:56:12 -04:00
parent 3f4fd55c63
commit ad49d92899
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -111,7 +111,9 @@ stdenv.mkDerivation {
] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}")
++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";
postInstall = if isModular then '' postInstall = stdenv.lib.optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'' + (if isModular then ''
make modules_install $makeFlags "''${makeFlagsArray[@]}" \ make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"
rm -f $out/lib/modules/${modDirVersion}/{build,source} rm -f $out/lib/modules/${modDirVersion}/{build,source}
@ -123,7 +125,7 @@ stdenv.mkDerivation {
'' else optionalString installsFirmware '' '' else optionalString installsFirmware ''
make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"
''; '');
postFixup = optionalString isModular '' postFixup = optionalString isModular ''
if [ -z "$dontStrip" ]; then if [ -z "$dontStrip" ]; then