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

Revert "linux 4.10"

Browse Source 
Somehow the tarball was actually linux 4.4.10

This reverts commit fea71f84d0.
This commit is contained in:
Shea Levy 2017-02-20 07:29:47 -05:00
parent dcba6eae1b
commit b191ac0d89
3 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ with stdenv.lib;
DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
''}
${optionalString (versionAtLeast version "4.9") ''
DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
''}
@ -229,7 +229,7 @@ with stdenv.lib;
EXT3_FS_POSIX_ACL y
EXT3_FS_SECURITY y
EXT4_FS_POSIX_ACL y
EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"}
EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
EXT4_FS_SECURITY y
REISERFS_FS_XATTR? y
REISERFS_FS_POSIX_ACL? y

19
pkgs/os-specific/linux/kernel/linux-4.10.nix
View File

@ -1,19 +0,0 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.10";
extraMeta.branch = "4.10";
modDirVersion = "4.10.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

19
pkgs/top-level/all-packages.nix
View File

@ -11334,22 +11334,6 @@ with pkgs;
];
};
linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -11522,7 +11506,7 @@ with pkgs;
linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_4_10;
linuxPackages_latest = linuxPackages_4_9;
linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
@ -11533,7 +11517,6 @@ with pkgs;
linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);
# Don't forget to update linuxPackages_latest!
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.