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

linux/manual-config: Cleanup

Browse Source
This commit is contained in:
Shea Levy 2012-08-11 21:21:06 -04:00
parent 9ac776ab22
commit 839c58f5b1
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,51 +80,48 @@ let
++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";
in in
let self = stdenv.mkDerivation { stdenv.mkDerivation {
name = "linux-${version}"; name = "linux-${version}";
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
inherit version modDirVersion config kernelPatches src; inherit version modDirVersion config kernelPatches src;
};
source = stdenv.mkDerivation { sourceRoot = stdenv.mkDerivation {
name = "linux-${version}-source"; name = "linux-${version}-source";
inherit src; inherit src;
patches = map (p: p.patch) kernelPatches; patches = map (p: p.patch) kernelPatches;
phases = [ "unpackPhase" "patchPhase" "installPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" ];
prePatch = '' prePatch = ''
for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do
echo "stripping FHS paths in \`$mf'..." echo "stripping FHS paths in \`$mf'..."
sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'
done done
sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|'
''; '';
installPhase = '' installPhase = ''
cd .. cd ..
mv $sourceRoot $out mv $sourceRoot $out
''; '';
};
}; };
unpackPhase = '' unpackPhase = ''
export sourceRoot="${self.source}"
mkdir build mkdir build
export buildRoot="$(pwd)/build" export buildRoot="$(pwd)/build"
ln -sv ${configfile} $buildRoot/.config
cd $sourceRoot cd $sourceRoot
''; '';
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
make $makeFlags "''${makeFlagsArray[@]}" mrproper
ln -sv ${configfile} $buildRoot/.config
make $makeFlags "''${makeFlagsArray[@]}" oldconfig make $makeFlags "''${makeFlagsArray[@]}" oldconfig
rm $buildRoot/.config.old
runHook postConfigure runHook postConfigure
''; '';
@ -146,7 +143,6 @@ let self = stdenv.mkDerivation {
make modules_install $makeFlags "''${makeFlagsArray[@]}" \ make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"
rm -f $out/lib/modules/${modDirVersion}/build rm -f $out/lib/modules/${modDirVersion}/build
cd $buildRoot/..
mv $buildRoot $out/lib/modules/${modDirVersion}/build mv $buildRoot $out/lib/modules/${modDirVersion}/build
'' else optionalString installsFirmware '' '' else optionalString installsFirmware ''
make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
@ -168,4 +164,4 @@ let self = stdenv.mkDerivation {
]; ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
}; in self }