forked from mirrors/nixpkgs
Rename linuxManualConfig to buildLinux
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
c373a49b10
commit
d18bc25b95
nixos/modules/testing
pkgs
development/compilers/gcc/4.8
os-specific/linux/kernel
top-level
|
@ -5,7 +5,7 @@ let
|
||||||
(map (builtins.getAttr "configLine") config.system.requiredKernelConfig))
|
(map (builtins.getAttr "configLine") config.system.requiredKernelConfig))
|
||||||
);
|
);
|
||||||
|
|
||||||
origKernel = pkgs.linuxManualConfig {
|
origKernel = pkgs.buildLinux {
|
||||||
inherit (pkgs.linux) src version;
|
inherit (pkgs.linux) src version;
|
||||||
inherit configfile;
|
inherit configfile;
|
||||||
allowImportFromDerivation = true;
|
allowImportFromDerivation = true;
|
||||||
|
|
|
@ -315,7 +315,7 @@ stdenv.mkDerivation ({
|
||||||
" --with-gnu-as --without-gnu-ld "
|
" --with-gnu-as --without-gnu-ld "
|
||||||
else ""}
|
else ""}
|
||||||
--enable-lto
|
--enable-lto
|
||||||
${if enableMultilib then "" else "--disable-multilib"}
|
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
|
||||||
${if enableShared then "" else "--disable-shared"}
|
${if enableShared then "" else "--disable-shared"}
|
||||||
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
|
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
|
||||||
${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
|
${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, perl, linuxManualConfig
|
{ stdenv, perl, buildLinux
|
||||||
|
|
||||||
, # The kernel source tarball.
|
, # The kernel source tarball.
|
||||||
src
|
src
|
||||||
|
@ -97,7 +97,7 @@ let
|
||||||
installPhase = "mv .config $out";
|
installPhase = "mv .config $out";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernel = linuxManualConfig {
|
kernel = buildLinux {
|
||||||
inherit version modDirVersion src kernelPatches;
|
inherit version modDirVersion src kernelPatches;
|
||||||
|
|
||||||
configfile = configfile.nativeDrv or configfile;
|
configfile = configfile.nativeDrv or configfile;
|
||||||
|
|
|
@ -6550,7 +6550,7 @@ let
|
||||||
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
|
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
|
||||||
|
|
||||||
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
|
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[ kernelPatches.sec_perm_2_6_24
|
[ kernelPatches.sec_perm_2_6_24
|
||||||
];
|
];
|
||||||
|
@ -6599,7 +6599,7 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
|
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[ kernelPatches.sec_perm_2_6_24
|
[ kernelPatches.sec_perm_2_6_24
|
||||||
] ++ lib.optionals ((platform.kernelArch or null) == "mips")
|
] ++ lib.optionals ((platform.kernelArch or null) == "mips")
|
||||||
|
@ -6617,11 +6617,11 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
|
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
};
|
};
|
||||||
|
|
||||||
linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
|
linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[
|
[
|
||||||
kernelPatches.sec_perm_2_6_24
|
kernelPatches.sec_perm_2_6_24
|
||||||
|
@ -6642,7 +6642,7 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
|
linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[
|
[
|
||||||
kernelPatches.sec_perm_2_6_24
|
kernelPatches.sec_perm_2_6_24
|
||||||
|
@ -6654,7 +6654,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
|
linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[
|
[
|
||||||
kernelPatches.sec_perm_2_6_24
|
kernelPatches.sec_perm_2_6_24
|
||||||
|
@ -6666,7 +6666,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {
|
linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {
|
||||||
inherit fetchurl stdenv perl linuxManualConfig;
|
inherit fetchurl stdenv perl buildLinux;
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[
|
[
|
||||||
kernelPatches.sec_perm_2_6_24
|
kernelPatches.sec_perm_2_6_24
|
||||||
|
@ -6775,7 +6775,8 @@ let
|
||||||
linuxPackages = linuxPackages_3_10;
|
linuxPackages = linuxPackages_3_10;
|
||||||
|
|
||||||
# A function to build a manually-configured kernel
|
# A function to build a manually-configured kernel
|
||||||
linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {
|
linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux;
|
||||||
|
buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
|
||||||
inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
|
inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue