summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-09-05 12:14:15 +0100
committerRobin Gloster <mail@glob.in>2017-09-05 14:42:23 +0200
commit44f93731d6f013b73b4fcd0303934b43a7f55693 (patch)
treed1efb187cd9fb67be34af875ac0a9bf68723075d
parentbf491f87940b8607063b508a642791233649f894 (diff)
downloadnixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar.gz
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar.bz2
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar.lz
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar.xz
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.tar.zst
nixpkgs-44f93731d6f013b73b4fcd0303934b43a7f55693.zip
linux_chromiumos_3_18: remove kernel due lack of maintainer/breakage
There is no maintainer for this package, probably not many users.
It requires effort to fix all third-party modules for this old kernel
versions. It might contain unpatched security holes.

For Pixel chromebooks, we have the samus-kernel.
Apart from that https://github.com/GalliumOS/linux might be a good choice.
-rw-r--r--pkgs/os-specific/linux/acpi-call/default.nix3
-rw-r--r--pkgs/os-specific/linux/ena/default.nix1
-rw-r--r--pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch48
-rw-r--r--pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch15
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix67
-rw-r--r--pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix23
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix10
-rw-r--r--pkgs/os-specific/linux/lttng-modules/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix16
9 files changed, 4 insertions, 183 deletions
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 4a7a2abbb59..a04d1decbd8 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     sed -e "s@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@" -i Makefile
     sed -e 's@acpi/acpi[.]h@linux/acpi.h@g' -i acpi_call.c
   '';
- 
+
   installPhase = ''
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
     cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc
@@ -37,6 +37,5 @@ stdenv.mkDerivation {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     description = "A module allowing arbitrary ACPI calls; use case: hybrid video";
-    broken = kernel.features.chromiumos or false;
   };
 }
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index d293e276999..363ecf4fc41 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.linux;
-    broken = kernel.features.chromiumos or false;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
deleted file mode 100644
index 2d8af8fa745..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
-index 48398b4..0e37f7d 100644
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -198,30 +198,6 @@ config DEV_COREDUMP
- 	default y if WANT_DEV_COREDUMP
- 	depends on ALLOW_DEV_COREDUMP
- 
--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
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index 58154a9..53a0d73 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -81,7 +81,7 @@ config MFD_AXP20X
- 
- 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.
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
deleted file mode 100644
index ce19dd5d169..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/fs/namei.c b/fs/namei.c
-index d999a86..eb6e530 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -703,8 +703,8 @@ static inline void put_link(struct nameidata *nd, struct path *link, void *cooki
- 	path_put(link);
- }
- 
--int sysctl_protected_symlinks __read_mostly = 1;
--int sysctl_protected_hardlinks __read_mostly = 1;
-+int sysctl_protected_symlinks __read_mostly = 0;
-+int sysctl_protected_hardlinks __read_mostly = 0;
- 
- /**
-  * may_follow_link - Check symlink following for unsafe situations
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index dfb5d2a43e1..efad17f43b4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -202,7 +202,7 @@ with stdenv.lib;
 
   # Video configuration.
   # Enable KMS for devices whose X.org driver supports it.
-  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
+  ${optionalString (versionOlder version "4.3") ''
     DRM_I915_KMS y
   ''}
   # Allow specifying custom EDID on the kernel command line
@@ -566,9 +566,7 @@ with stdenv.lib;
   MEDIA_CAMERA_SUPPORT y
   MEDIA_RC_SUPPORT y
   MEDIA_USB_SUPPORT y
-  ${optionalString (!(features.chromiumos or false)) ''
-    MEDIA_PCI_SUPPORT y
-  ''}
+  MEDIA_PCI_SUPPORT y
 
   # Our initrd init uses shebang scripts, so can't be modular.
   BINFMT_SCRIPT y
@@ -662,67 +660,6 @@ with stdenv.lib;
     WW_MUTEX_SELFTEST? n
   ''}
 
-  # ChromiumOS support
-  ${optionalString (features.chromiumos or false) ''
-    CHROME_PLATFORMS y
-    VGA_SWITCHEROO n
-    MMC_SDHCI_PXAV2 n
-    NET_IPVTI n
-    IPV6_VTI n
-    REGULATOR_FIXED_VOLTAGE n
-    TPS6105X n
-    CPU_FREQ_STAT y
-    IPV6 y
-    MFD_CROS_EC y
-    MFD_CROS_EC_LPC y
-    MFD_CROS_EC_DEV y
-    CHARGER_CROS_USB_PD y
-    I2C y
-    MEDIA_SUBDRV_AUTOSELECT n
-    VIDEO_IR_I2C n
-    BLK_DEV_DM y
-    ANDROID_PARANOID_NETWORK n
-    DM_VERITY n
-    DRM_VGEM n
-    CPU_FREQ_GOV_INTERACTIVE n
-    INPUT_KEYRESET n
-    DM_BOOTCACHE n
-    UID_CPUTIME n
-
-    ${optionalString (versionAtLeast version "3.18") ''
-      CPUFREQ_DT n
-      EXTCON_CROS_EC n
-      DRM_POWERVR_ROGUE n
-      CHROMEOS_OF_FIRMWARE y
-      TEST_RHASHTABLE n
-      BCMDHD n
-      TRUSTY n
-    ''}
-
-    ${optionalString (versionOlder version "3.18") ''
-      MALI_MIDGARD n
-      DVB_USB_DIB0700 n
-      DVB_USB_DW2102 n
-      DVB_USB_PCTV452E n
-      DVB_USB_TTUSB2 n
-      DVB_USB_AF9015 n
-      DVB_USB_AF9035 n
-      DVB_USB_ANYSEE n
-      DVB_USB_AZ6007 n
-      DVB_USB_IT913X n
-      DVB_USB_LME2510 n
-      DVB_USB_RTL28XXU n
-      USB_S2255 n
-      VIDEO_EM28XX n
-      VIDEO_TM6000 n
-      USB_DWC2 n
-      USB_GSPCA n
-      SPEAKUP n
-      XO15_EBOOK n
-      USB_GADGET n
-    ''}
-  ''}
-
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
deleted file mode 100644
index e27b2afb200..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args:
-
-# ChromiumOS requires a 64bit build host
-assert stdenv.is64bit;
-
-import ./generic.nix (args // rec {
-  version = "3.18.0";
-  extraMeta.branch = "3.18";
-
-  src = fetchgit {
-    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
-    rev = "3179ec7e3f07fcc3ca35817174c5fc6584030ab3";
-    sha256 = "0c9ccasx9kisck23350w1xf8s7qzvgvn70xlxdbkh2b18kgm0y5f";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-  features.chromiumos = true;
-
-  extraMeta.hydraPlatforms = [];
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0a364823640..93d7acdd8e7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -56,16 +56,6 @@ rec {
       patch = ./genksyms-fix-segfault.patch;
     };
 
-  chromiumos_Kconfig_fix_entries_3_18 =
-    { name = "Kconfig_fix_entries_3_18";
-      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
-    };
-
-  chromiumos_no_link_restrictions =
-    { name = "chromium-no-link-restrictions";
-      patch = ./chromiumos-patches/no-link-restrictions.patch;
-    };
-
   cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
 
   DCCP_double_free_vulnerability_CVE-2017-6074 = rec
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index d323c277814..a2dafc0bf2d 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
     license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
-    broken =
-      (builtins.compareVersions kernel.version "3.18" == -1) ||
-      (kernel.features.chromiumos or false);
+    broken = builtins.compareVersions kernel.version "3.18" == -1;
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd0b95aa07f..f7b1b3a58e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12286,18 +12286,6 @@ with pkgs;
 
   linux_samus_latest = linux_samus_4_12;
 
-  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
-                      kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
-                    ];
-    # compiler-gcc.h:107:30: fatal error: linux/compiler-gcc6.h: No such file or directory
-    stdenv = overrideCC stdenv gcc5;
-  };
-
-  linux_chromiumos_latest = linux_chromiumos_3_18;
-
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -12480,10 +12468,6 @@ with pkgs;
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
   linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);
 
-  # ChromiumOS kernels
-  linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
-  linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
-
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;
   buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});