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

Improved the Linux kernel building framework

Browse Source 
Moved the hardcoded postBuild hook from the builder to generic.nix:

Some old kernel (such as 2.6.15) did not yet support the unifdef target.
As a result, compiling them with the current Linux builder leads to a
failure.
Fixed by moving this hook as argument of the top-level function of
generic.nix. This allows some kernel nix codes to overrides its default
value.

svn path=/nixpkgs/trunk/; revision=27708
This commit is contained in:
Ludovic Stordeur 2011-07-11 13:59:37 +00:00
parent eabbecd10f
commit 8268a39690
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,8 @@ postPatch() {
} }
configurePhase() { configurePhase() {
if test -n "$preConfigure"; then if test -n "$preConfigure"; then
eval "$preConfigure"; eval "$preConfigure";
fi fi
export INSTALL_PATH=$out export INSTALL_PATH=$out
@ -46,13 +46,6 @@ configurePhase() {
} }
postBuild() {
# After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/...
make $makeFlags $kernelTarget
make $makeFlags -C scripts unifdef
}
installPhase() { installPhase() {
ensureDir $out ensureDir $out
@ -149,8 +142,8 @@ installPhase() {
fi fi
fi fi
if test -n "$postInstall"; then if test -n "$postInstall"; then
eval "$postInstall"; eval "$postInstall";
fi fi
} }

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

@ -35,6 +35,10 @@
, extraMeta ? {} , extraMeta ? {}
, ubootChooser ? null , ubootChooser ? null
, postInstall ? "" , postInstall ? ""
, # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/...
postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
, ... , ...
}: }: