mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-06 13:53:05 +00:00
kernel: remove leftover remnants of old cross compiling system
This commit is contained in:
parent
a09709bf2a
commit
285181a1db
@ -44,14 +44,12 @@ let
|
||||
netfilterRPFilter = true;
|
||||
} // features) kernelPatches;
|
||||
|
||||
configWithPlatform = kernelPlatform: import ./common-config.nix {
|
||||
inherit stdenv version kernelPlatform extraConfig;
|
||||
config = import ./common-config.nix {
|
||||
inherit stdenv version extraConfig;
|
||||
kernelPlatform = hostPlatform;
|
||||
features = kernelFeatures; # Ensure we know of all extra patches, etc.
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
configCross = configWithPlatform hostPlatform.platform;
|
||||
|
||||
kernelConfigFun = baseConfig:
|
||||
let
|
||||
configFromPatches =
|
||||
@ -75,12 +73,6 @@ let
|
||||
preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
|
||||
arch = hostPlatform.platform.kernelArch;
|
||||
|
||||
crossAttrs = let
|
||||
cp = hostPlatform.platform;
|
||||
in {
|
||||
ignoreConfigErrors = true;
|
||||
};
|
||||
|
||||
prePatch = kernel.prePatch + ''
|
||||
# Patch kconfig to print "###" after every question so that
|
||||
# generate-config.pl from the generic builder can answer them.
|
||||
@ -108,9 +100,7 @@ let
|
||||
};
|
||||
|
||||
kernel = buildLinux {
|
||||
inherit version modDirVersion src kernelPatches stdenv extraMeta;
|
||||
|
||||
configfile = configfile.nativeDrv or configfile;
|
||||
inherit version modDirVersion src kernelPatches stdenv extraMeta configfile;
|
||||
|
||||
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user