linux_testing: 6.5-rc7 -> 6.6-rc1

rc1: https://lwn.net/Articles/944122/
This commit is contained in:
Kiskae 2023-09-11 12:25:02 +02:00 committed by Alyssa Ross
parent 55ec5ae7d6
commit 813e000742
3 changed files with 8 additions and 7 deletions

View file

@ -603,8 +603,8 @@ let
microcode = {
MICROCODE = yes;
MICROCODE_INTEL = yes;
MICROCODE_AMD = yes;
MICROCODE_INTEL = whenOlder "6.6" yes;
MICROCODE_AMD = whenOlder "6.6" yes;
# Write Back Throttling
# https://lwn.net/Articles/682582/
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
@ -913,7 +913,7 @@ let
SECCOMP = yes; # used by systemd >= 231
SECCOMP_FILTER = yes; # ditto
POSIX_MQUEUE = yes;
FRONTSWAP = yes;
FRONTSWAP = whenOlder "6.6" yes;
FUSION = yes; # Fusion MPT device support
IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14
IDLE_PAGE_TRACKING = yes;

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.5-rc7";
version = "6.6-rc1";
extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchzip {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
hash = "sha256-5rIcyXN54o9P+RxHZkI/BTO2Ox6uJ0Fi9NVcrN1HczQ=";
hash = "sha256-DRai7HhWVtRB0GiRCvCv2JM2TFKRsZ60ohD6GW0b8As=";
};
# Should the testing kernels ever be built on Hydra?

View file

@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod
, fetchpatch
}:
@ -271,7 +271,7 @@ let
make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}"
unlink $out/lib/modules/${modDirVersion}/build
unlink $out/lib/modules/${modDirVersion}/source
rm -f $out/lib/modules/${modDirVersion}/source
mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
@ -376,6 +376,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
++ optional (lib.versionAtLeast version "5.8") elfutils
++ optional (lib.versionAtLeast version "6.6") kmod
;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];