alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #25146 from zx2c4/remove-old-chromiumos

Browse source 
linux-chromiumos: remove 3.14
This commit is contained in:
Jörg Thalheim 2017-04-25 07:32:51 +02:00 committed by GitHub
parent 3ae7f249da b1750d699c
commit bd47d04294
5 changed files with 0 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
View file

@ -1,47 +0,0 @@
From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 25 Dec 2015 17:11:40 +0300
Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry
---
drivers/base/Kconfig | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 946ced4..fc3405e1 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER
no longer required unless you have a special firmware file that
resides in a non-standard path.
-config WANT_DEV_COREDUMP
- bool
- help
- Drivers should "select" this option if they desire to use the
- device coredump mechanism.
-
-config ALLOW_DEV_COREDUMP
- bool "Allow device coredump" if EXPERT
- default y
- help
- This option controls if the device coredump mechanism is available or
- not; if disabled, the mechanism will be omitted even if drivers that
- can use it are enabled.
- Say 'N' for more sensitive systems or systems that don't want
- to ever access the information to not have the code, nor keep any
- data.
-
- If unsure, say Y.
-
-config DEV_COREDUMP
- bool
- default y if WANT_DEV_COREDUMP
- depends on ALLOW_DEV_COREDUMP
-
config DEBUG_DRIVER
bool "Driver Core verbose debug messages"
depends on DEBUG_KERNEL
--
2.6.3

25
pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
View file

@ -1,25 +0,0 @@
From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 25 Dec 2015 17:11:56 +0300
Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC
---
drivers/mfd/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f425dce..a62a285 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE
config MFD_CROS_EC
tristate "Support ChromeOS Embedded Controller"
- depends on MFD_CORE
+ select MFD_CORE
help
If you say Y here you get support for the ChromeOS Embedded
Controller (EC) providing keyboard, battery and power services.
--
2.6.3

21
pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
View file

@ -1,21 +0,0 @@
{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args:
# ChromiumOS requires a 64bit build host
assert stdenv.is64bit;
import ./generic.nix (args // rec {
version = "3.14.0";
extraMeta.branch = "3.14";
src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57";
sha256 = "1gysrjanvnkbvgml7ipjr119bmlqfqn2zz5ca5kjkapwrfm3cb69";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
features.chromiumos = true;
} // (args.argsOverride or {}))

6
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -123,12 +123,6 @@ rec {
patch = ./genksyms-fix-segfault.patch;
};
chromiumos_Kconfig_fix_entries_3_14 =
{ name = "Kconfig_fix_entries_3_14";
patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch;
};
chromiumos_Kconfig_fix_entries_3_18 =
{ name = "Kconfig_fix_entries_3_18";
patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;

10
pkgs/top-level/all-packages.nix
View file

@ -11701,15 +11701,6 @@ with pkgs;
];
};
linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix {
kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14
kernelPatches.chromiumos_mfd_fix_dependency
kernelPatches.chromiumos_no_link_restrictions
kernelPatches.genksyms_fix_segfault
kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
];
};
linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
kernelPatches.chromiumos_no_link_restrictions
@ -11924,7 +11915,6 @@ with pkgs;
};
# ChromiumOS kernels
linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14);
linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);