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

linux: 4.20-rc7 -> 5.0-rc1

Browse Source
This commit is contained in:
Tim Steinbach 2019-01-07 07:57:32 -05:00
parent 220aa6713b
commit 97aba92bcd
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,9 +88,9 @@ let
# Include the CFQ I/O scheduler in the kernel, rather than as a # Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler. # module, so that the initrd gets a good I/O scheduler.
scheduler = { scheduler = {
IOSCHED_CFQ = yes; IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1
BLK_CGROUP = yes; # required by CFQ" BLK_CGROUP = yes; # required by CFQ"
IOSCHED_DEADLINE = yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes; MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes;
BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes; BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes;
MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes; MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes;
@ -365,7 +365,7 @@ let
# https://lwn.net/Articles/682582/ # https://lwn.net/Articles/682582/
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655 # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
BLK_WBT = yes; BLK_WBT = yes;
BLK_WBT_SQ = yes; BLK_WBT_SQ = whenOlder "5.0" yes; # Removed in 5.0-RC1
BLK_WBT_MQ = yes; BLK_WBT_MQ = yes;
}; };
@ -382,7 +382,7 @@ let
DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes; DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes;
BLK_DEV_THROTTLING = yes; BLK_DEV_THROTTLING = yes;
CFQ_GROUP_IOSCHED = yes; CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
CGROUP_PIDS = whenAtLeast "4.3" yes; CGROUP_PIDS = whenAtLeast "4.3" yes;
}; };
@ -466,7 +466,7 @@ let
MEDIA_DIGITAL_TV_SUPPORT = yes; MEDIA_DIGITAL_TV_SUPPORT = yes;
MEDIA_CAMERA_SUPPORT = yes; MEDIA_CAMERA_SUPPORT = yes;
MEDIA_RC_SUPPORT = whenOlder "4.14" yes; MEDIA_RC_SUPPORT = whenOlder "4.14" yes;
MEDIA_CONTROLLER = yes; MEDIA_CONTROLLER = yes;
MEDIA_PCI_SUPPORT = yes; MEDIA_PCI_SUPPORT = yes;
MEDIA_USB_SUPPORT = yes; MEDIA_USB_SUPPORT = yes;
MEDIA_ANALOG_TV_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes;

8
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.20-rc7"; version = "5.0-rc1";
modDirVersion = "4.20.0-rc7"; modDirVersion = "5.0.0-rc1";
extraMeta.branch = "4.20"; extraMeta.branch = "5.0";
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0qga2x4rz1vphi7j044f4b4la24qyk5sm7lm8q991imq5wm5s2rl"; sha256 = "01gva1hp2jyf137iy5ryaq93ksiw9ysnczpp914scx6k005y7yzz";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?