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

kernel: I hope to fix the dtbs thing

Browse Source 
I thought $arch was defined. Now I'm using karch, that should serve for cross
building as well.
This commit is contained in:
Lluís Batlle i Rossell 2015-02-21 19:01:17 +00:00
parent 31cccd88ed
commit cfd9b77e82
1 changed files with 5 additions and 1 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

@ -122,7 +122,7 @@ let
mkdir -p $out/lib/firmware mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then '' '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs make $makeFlags "''${makeFlagsArray[@]}" dtbs
cp arch/$arch/boot/dts/*dtb $out cp $buildRoot/arch/$karch/boot/dts/*dtb $out
'' else "") + (if isModular then '' '' else "") + (if isModular then ''
make modules_install $makeFlags "''${makeFlagsArray[@]}" \ make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"
@ -225,6 +225,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
"ARCH=${stdenv.platform.kernelArch}" "ARCH=${stdenv.platform.kernelArch}"
]; ];
karch = stdenv.platform.kernelArch;
crossAttrs = let cp = stdenv.cross.platform; in crossAttrs = let cp = stdenv.cross.platform; in
(drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // { (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
@ -232,6 +234,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
"CROSS_COMPILE=$(crossConfig)-" "CROSS_COMPILE=$(crossConfig)-"
]; ];
karch = cp.kernelArch;
# !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86,
# crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot
# can just go into buildInputs (but not nativeBuildInputs since cp.uboot # can just go into buildInputs (but not nativeBuildInputs since cp.uboot