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

linux: 4.16-rc7 -> 4.17-rc1

Browse Source
This commit is contained in:
Tim Steinbach 2018-04-17 20:28:11 -04:00
parent 329ca7db6c
commit f8665f18fb
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,6 @@ with stdenv.lib;
# Enable various subsystems. # Enable various subsystems.
ACCESSIBILITY y # Accessibility support ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI y HIPPI y
MTD_COMPLEX_MAPPINGS y # needed for many devices MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices SCSI_LOWLEVEL y # enable lots of SCSI devices
@ -124,6 +123,9 @@ with stdenv.lib;
SPI y # needed for many devices SPI y # needed for many devices
SPI_MASTER y SPI_MASTER y
WAN y WAN y
${optionalString (versionOlder version "4.17") ''
DONGLE y # Serial dongle support
''}
# Networking options. # Networking options.
NET y NET y
@ -420,7 +422,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.3") '' ${optionalString (versionAtLeast version "4.3") ''
IDLE_PAGE_TRACKING y IDLE_PAGE_TRACKING y
''} ''}
IRDA_ULTRA y # Ultra (connectionless) protocol ${optionalString (versionOlder version "4.17") ''
IRDA_ULTRA y # Ultra (connectionless) protocol
''}
JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support

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

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.16-rc7"; version = "4.17-rc1";
modDirVersion = "4.16.0-rc7"; modDirVersion = "4.17.0-rc1";
extraMeta.branch = "4.16"; extraMeta.branch = "4.17";
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 = "13zpfjxd38202afjl6flc9brjw3sp4sfq3wls0v90k1i2b308qfi"; sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?