diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-01-12 08:14:24 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-01-12 08:14:24 +0100 |
| commit | 225ed17457fae8e4a1aa46de1d187177753a1141 (patch) | |
| tree | 124935f3a929c4ab4de3c540d71da09d819b2438 | |
| parent | c26c951386e422814c411693184018b7df4430d6 (diff) | |
aszlig/kernel: Fix up BFQ patch for kernel 4.10
First of all, using .patch from the GitHub compare view is not going to work because the concatenated diffs are in reverse order for use within "git apply". And the second thing why it's not working is that the patch has a hunk that changes the version in Makefile to add an extra version -rc1-bfq, which would only apply for kernel 4.10-rc1 but not for subsequent release canidates. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | modules/user/aszlig/system/kernel.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix index 29ed3fe8..25cff5c0 100644 --- a/modules/user/aszlig/system/kernel.nix +++ b/modules/user/aszlig/system/kernel.nix @@ -13,8 +13,12 @@ name = "bfq-v8r7.patch"; url = "https://github.com/linusw/linux-bfq/compare/" + "238d1d0f79f619d75c2cc741d6770fb0986aef24..." - + "eaa6f84b3c10985b01a1d7ff1a77fb5f43df714d.patch"; - sha256 = "1ir9m5smd82maipy7jjs4vmfsz18qz51gz3zy9gmmiaznm0i9llx"; + + "eaa6f84b3c10985b01a1d7ff1a77fb5f43df714d.diff"; + postFetch = '' + "${pkgs.patchutils}/bin/filterdiff" -x '[ab]/Makefile' "$out" > tmp + mv tmp "$out" + ''; + sha256 = "1q108w6w5l4qdnicp01c4kb4rdgs2q34vh0gb5436hsj5diai69q"; }; extraConfig = (pkgs.vuizvui.kernel.bfqsched.extraConfig or "") + '' IOSCHED_BFQ y |