linux_riscv: Move patches to my Linux fork.

All patches there are also submitted upstream and will be removed if rejected. Also includes some fixes to get module loading working.
NixOS · Feb 23, 2018 · cb025f2 · cb025f2
1 parent 0b0b5a5
commit cb025f2
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 229 deletions.
diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix
@@ -1,15 +1,15 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc1";
-  modDirVersion = "4.16.0-rc1";
+  version = "4.16-rc2";
+  modDirVersion = "4.16.0-rc2";
   extraMeta.branch = "4.16";
 
   src = fetchFromGitHub {
-    owner = "riscv";
+    owner = "shlevy";
     repo ="riscv-linux";
-    rev = "a31991a9c6ce2c86fd676cf458a0ec10edc20d37";
-    sha256 = "0n97wfbi3pnp5c70xfj7s0fk8zjjkjz6ldxh7n54kbf64l4in01f";
+    rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6";
+    sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv";
   };
 
   # Should the testing kernels ever be built on Hydra?

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
@@ -73,33 +73,4 @@ rec {
     };
   };
 
-  riscv_modules = {
-    name = "riscv-modules";
-    patch = ./riscv-modules.patch;
-  };
-
-  # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000054.html
-  riscv_irq_busy = {
-    name = "riscv-irq-busy";
-    patch = ./riscv-irq-busy.patch;
-  };
-
-  # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000059.html
-  riscv_install = {
-    name = "riscv-install";
-    patch = ./riscv-install.patch;
-  };
-
-  # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000056.html
-  riscv_initrd = {
-    name = "riscv-initrd";
-    patch = ./riscv-initrd.patch;
-  };
-
-  # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000058.html
-  riscv_initrd_free = {
-    name = "riscv-initrd-free";
-    patch = ./riscv-initrd-free.patch;
-  };
-
 }
diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch b/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch
diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd.patch b/pkgs/os-specific/linux/kernel/riscv-initrd.patch
diff --git a/pkgs/os-specific/linux/kernel/riscv-install.patch b/pkgs/os-specific/linux/kernel/riscv-install.patch
diff --git a/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch b/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch
diff --git a/pkgs/os-specific/linux/kernel/riscv-modules.patch b/pkgs/os-specific/linux/kernel/riscv-modules.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13162,13 +13162,7 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-    ] ++ lib.optionals hostPlatform.isRiscV [
-      kernelPatches.riscv_modules
-      kernelPatches.riscv_irq_busy
-      kernelPatches.riscv_install
-      kernelPatches.riscv_initrd
-      kernelPatches.riscv_initrd_free
-   ];
+    ];
   };
 
   linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
@@ -13179,7 +13173,7 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-    ];
+      ];
   };
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So