From 081022d47289066e5905dc65148d6b3e6193e10b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Jan 2016 04:17:39 +0100
Subject: pkgs/bfqsched: Update to version 4.4.0-v7r11

We can now drop the kernel 4.4 patch and use the upstream version,
because kernel 4.4 has been released since quite a while.

The names for the patches changed a bit on the BFQ scheduler page but
they represent the same commits nevertheless.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/kpatches/bfqsched/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'pkgs/kpatches/bfqsched/default.nix')

diff --git a/pkgs/kpatches/bfqsched/default.nix b/pkgs/kpatches/bfqsched/default.nix
index f71b7135..fd6c6f81 100644
--- a/pkgs/kpatches/bfqsched/default.nix
+++ b/pkgs/kpatches/bfqsched/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl }:
 
 let
-  bfqVersion = "v7r8";
-  kernelVersion = "4.3";
-  version = "${kernelVersion}.0-${bfqVersion}";
+  bfqVersion = "v7r11";
+  kernelVersion = "4.4";
+  fullKernelVersion = "${kernelVersion}.0";
+  version = "${fullKernelVersion}-${bfqVersion}";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
 
@@ -15,20 +16,19 @@ let
   allPatches = [
     (fetchPatch {
       name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-"
-           + "${bfqVersion}-${kernelVersion}";
-      sha256 = "14549awmvsqwzb7912k83dmlznx5lak8gcivqjd79clrd4h65szb";
+           + "${bfqVersion}-${fullKernelVersion}";
+      sha256 = "1kmlfz63610zc4lxhanjsn4hhw43cdsbk3pyaij723vbd7619kyi";
     })
     (fetchPatch {
       name = "0002-block-introduce-the-BFQ-"
-           + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "1sw65hxjimg9w04f7ccrxhl1c8b1ddd21ni9af77cyrkp11cpdwi";
+           + "${bfqVersion}-I-O-sched-for-${fullKernelVersion}";
+      sha256 = "1i5jqkxglp3ah76i4vyi13pnmjkr6qlqy69qbaj2132vijqkyz5i";
     })
     (fetchPatch {
       name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
-           + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "178spkcwaz79rz8fb7h209grbgr2ca4lbgfmns4d43b7aiqhqhvp";
+           + "${bfqVersion}-for";
+      sha256 = "09bv31s8d2aphi3d9py4sz1gcvyb5645a8s7zj614a56hv11p8k9";
     })
-    ./kernel-4.4.patch
   ];
 
   patch = stdenv.mkDerivation {
-- 
cgit 1.4.1