From 9493159017858013b7f7c33a158fa6973bed705c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 1 Apr 2014 00:56:23 -0500 Subject: [PATCH 1/5] kernel: remove 3.11 series (EOL) Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.11.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 10 ---------- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.11.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix deleted file mode 100644 index 6c3c37663c6..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.11.10"; - extraMeta.branch = "3.11"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "00g4rbkjsmyzzm9zmdll8qqs1mffa0pybwjpn9jnli2kgh9inzyb"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2bb49f63b0..573b7042705 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6941,15 +6941,6 @@ let ''; }); - linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { - inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7069,7 +7060,6 @@ let linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; - linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity; linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); From bdff718c5beac36c46f9d1e458ef25a50aef752c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 1 Apr 2014 01:10:28 -0500 Subject: [PATCH 2/5] kernel: add lockdep expression Lockdep is the kernel's locking validation/debugging tool and has seen heavy pro-active usage and development. In Linux 3.14, it's now available directly to userspace for the same purpose. It comes with a convenient utility to LD_PRELOAD a shared library for validation, or a user-space API to link to directly. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/lockdep.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/lockdep.nix diff --git a/pkgs/os-specific/linux/kernel/lockdep.nix b/pkgs/os-specific/linux/kernel/lockdep.nix new file mode 100644 index 00000000000..4b1805fc39e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/lockdep.nix @@ -0,0 +1,25 @@ +{ stdenv, kernel }: + +assert stdenv.lib.versionAtLeast kernel.version "3.14"; +stdenv.mkDerivation { + name = "lockdep-linux-${kernel.version}"; + inherit (kernel) src patches; + + preConfigure = "cd tools/lib/lockdep"; + installPhase = '' + mkdir -p $out/bin $out/lib $out/include + + cp -R include/liblockdep $out/include + make install DESTDIR=$out prefix="" + + substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so" + ''; + + meta = { + description = "User-space locking validation via the kernel"; + homepage = "https://kernel.org/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 573b7042705..b0405bbd656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7031,6 +7031,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + lockdep = callPackage ../os-specific/linux/kernel/lockdep.nix { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; From 1459896be15887fe093932de18f8179aa2a32868 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 1 Apr 2014 02:59:20 -0500 Subject: [PATCH 3/5] kernel: add myself to maintainer list Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/manual-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index dd199814760..6805355052a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,6 +198,7 @@ let repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ maintainers.shlevy + maintainers.thoughtpolice ]; platforms = platforms.linux; }; From 4202a9315a6786e2b6f7e12fa84689624e7822d6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 1 Apr 2014 02:59:53 -0500 Subject: [PATCH 4/5] grsecurity: add myself to maintainer list Signed-off-by: Austin Seipp --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0405bbd656..36a9211785c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6872,7 +6872,7 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs { - maintainers = with lib.maintainers; [ wizeman ]; + maintainers = with lib.maintainers; [ wizeman thoughtpolice ]; } (lib.overrideDerivation (linux_3_2.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ]; argsOverride = { @@ -6881,7 +6881,7 @@ let })) (args: grsecurityOverrider args))); linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs { - maintainers = with lib.maintainers; [ wizeman ]; + maintainers = with lib.maintainers; [ wizeman thoughtpolice ]; } (lib.overrideDerivation (linux_3_13.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ]; argsOverride = { From 7288f25bd1ecaf19182ba2a7bfa4b488303e17ad Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 1 Apr 2014 03:00:17 -0500 Subject: [PATCH 5/5] kernel: stable/longterm updates - longterm: 3.4.83 -> 3.4.85 - longterm: 3.10.33 -> 3.10.35 - longterm: 3.12.14 -> 3.12.15 - stable: 3.13.7 -> 3.13.8 NOTE: This will break the testing grsec kernel at the moment (there's not a 3.18.8 patch yet), but it's destined to be upgraded to 3.14 soon anyway. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.13.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 4c6e01271fb..e5dbfe0d27b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.33"; + version = "3.10.35"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh"; + sha256 = "01hznshgclxgs9hvag1i1a69k95nf61z00q6qly4ym25wb77znyv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index e2ec7295a5f..c758768a5ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.14"; + version = "3.12.15"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx"; + sha256 = "08y42y5piibql0v6pwdp19nxvw5jngs4nw404lwh412zk0cnh4gn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix index c7658cc232e..b2be5ff2074 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.7"; + version = "3.13.8"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0llyc343hzk8a2vhv63xja269jfqaavz613x98y71qfi05ald524"; + sha256 = "0z6lfsf1ldv7id3fm6l5jdn7c6076605wj7mfi90pgf079kbbqwj"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 294f616242d..5eeddb35adb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.83"; + version = "3.4.85"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1jammd31cgzymaqd2qwrm1shx5xwpaxmpnv658fix275fn35a8gb"; + sha256 = "1ldbq9qka6bdgic4ydl9pnny734gyi2vxzdsnfmfi8mx7bnar29y"; }; features.iwlwifi = true;