Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

linux-testing 4.14-rc2 -> 4.15-rc1 #32137

Closed
wants to merge 1 commit into from
Closed

linux-testing 4.14-rc2 -> 4.15-rc1 #32137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Open in desktop
@@ -1,13 +1,13 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.14-rc8";
modDirVersion = "4.14.0-rc8";
extraMeta.branch = "4.14";
version = "4.15-rc1";
modDirVersion = "4.15.0-rc1";
extraMeta.branch = "4.15";

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh";
sha256 = "1l7c132qb5qjd80hga03ivssfq65brqyd95sb4rd065dqrixp20n";
};

# Should the testing kernels ever be built on Hydra?
Expand Down
9 changes: 8 additions & 1 deletion pkgs/os-specific/linux/kernel/manual-config.nix
View file
Open in desktop
@@ -1,4 +1,6 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, libelf ? null
, utillinux ? null
, writeTextFile, ubootTools
, hostPlatform
}:
Expand Down Expand Up @@ -230,13 +232,18 @@ let
};
in

assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
name = "linux-${version}";

enableParallelBuilding = true;

nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
;

hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];

Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -12577,7 +12577,6 @@ with pkgs;
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are those upstream now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I understand, they are with this commit. torvalds/linux@d18bee4

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's right, after two months of pings I got them in.

kernelPatches.modinst_arg_list_too_long
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu
Expand Down