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

kernel: remove leftover remnants of old cross compiling system

Browse Source
This commit is contained in:
Ben Wolsieffer 2018-01-15 12:41:55 -05:00
parent a09709bf2a
commit 285181a1db
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,14 +44,12 @@ let
netfilterRPFilter = true; netfilterRPFilter = true;
} // features) kernelPatches; } // features) kernelPatches;
configWithPlatform = kernelPlatform: import ./common-config.nix { config = import ./common-config.nix {
inherit stdenv version kernelPlatform extraConfig; inherit stdenv version extraConfig;
kernelPlatform = hostPlatform;
features = kernelFeatures; # Ensure we know of all extra patches, etc. features = kernelFeatures; # Ensure we know of all extra patches, etc.
}; };
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform hostPlatform.platform;
kernelConfigFun = baseConfig: kernelConfigFun = baseConfig:
let let
configFromPatches = configFromPatches =
@ -75,12 +73,6 @@ let
preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
arch = hostPlatform.platform.kernelArch; arch = hostPlatform.platform.kernelArch;
crossAttrs = let
cp = hostPlatform.platform;
in {
ignoreConfigErrors = true;
};
prePatch = kernel.prePatch + '' prePatch = kernel.prePatch + ''
# Patch kconfig to print "###" after every question so that # Patch kconfig to print "###" after every question so that
# generate-config.pl from the generic builder can answer them. # generate-config.pl from the generic builder can answer them.
@ -108,9 +100,7 @@ let
}; };
kernel = buildLinux { kernel = buildLinux {
inherit version modDirVersion src kernelPatches stdenv extraMeta; inherit version modDirVersion src kernelPatches stdenv extraMeta configfile;
configfile = configfile.nativeDrv or configfile;
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
}; };