linux: kernel: Add linux-ck for 4.14, 4.19 and 5.0 #59105

matthiasbeyer · 2019-04-07T11:24:11Z

Motivation for this change

Having linux-ck kernels in nixpkgs.

Stolen from https://github.com/kisonecat/nixos-linux-ck/blob/master/kernel.nix

Things done

Evaluation will fail because of pkgs/os-specific/linux/tbs/default.nix being broken.

teto · 2019-04-07T15:19:03Z

pkgs/top-level/all-packages.nix

+  # linux-ck kernels.
+  linuxPackages_4_14_ck = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14_ck);
+  linuxPackages_4_19_ck = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19_ck);
+  linuxPackages_5_0_ck  = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0_ck);


do we really want these aliases ?

teto · 2019-04-07T15:21:06Z

what is "ck" ? I have several ideas on the top of my head but none are realistic candidates xD

matthiasbeyer · 2019-04-07T15:44:30Z

I honestly don't know. That's what the patches are called.

I assume that's the first and lastname of the author.

vcunat · 2019-04-07T15:48:02Z

Here's some explanation of what it is, though without etymology: https://wiki.archlinux.org/index.php/Linux-ck

worldofpeace · 2019-04-07T22:11:10Z

pkgs/os-specific/linux/kernel/patches.nix

+
+  ck_5_0 = rec {
+    name = "patch-5.0-ck1.xz";
+    patch = fetchpatch {


error: Normalized patch '/build/76863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b13f9ea26780' is empty (while the fetched file was not)! Did you maybe fetch a HTML representation of a patch instead of a raw patch? Fetched file was: ...<BINARY>

Can't apply because it's still an archive.

I have the time and resources to test-build this now... so wait for it, I'm tryin' it out.

So yes, the problem is indeed that I fetch .xz and not .patch ... I am working on a solution right now.

matthiasbeyer · 2019-04-08T07:12:45Z

I honestly don't know how to do better and unfortunately it does not even work.

worldofpeace · 2019-04-08T08:29:14Z

thing I did to unpack the patch:

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1dacfe87486..ed557c12fd9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,4 +1,4 @@
-{ fetchpatch, fetchurl }:
+{ stdenv, fetchpatch, fetchurl }:
 
 rec {
   bridge_stp_helper =
@@ -89,13 +89,22 @@ rec {
     { fn = "0016-Add-ck1-version.patch";                                      h = "1k1dd3bxm3vf6afzbgw64ddmsng0w4w9l0yg6kb3fz82l22cwpc8"; }
   ];
 
-  ck_4_19 = rec {
-    name = "patch-4.19-ck1";
-    patch = fetchurl {
-      inherit name;
-      url    = http://ck.kolivas.org/patches/4.0/4.19/4.19-ck1/patch-4.19-ck1.xz;
-      sha256 = "77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780";
+  ck_4_19 = let
+    unpackedPatch = stdenv.mkDerivation rec {
+      name = "4.19-ck1";
+
+      src = fetchurl {
+        url    = http://ck.kolivas.org/patches/4.0/4.19/4.19-ck1/patch-4.19-ck1.xz;
+        sha256 = "77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780";
+      };
+
+      unpackPhase = "true";
+      installPhase = ''
+        unxz -c $src > $out
+      '';
     };
+  in rec {
+    patch = unpackedPatch;
   };
 
   ck_5_0 = rec {

Maybe do something in postFetch for fetchurl instead of that.

Or perhaps we can just get a compare patch from github

https://github.com/ckolivas/linux/compare/84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d..da178919d63ecfec2738877abae02cd2ce8aa29c.patch

matthiasbeyer · 2019-04-08T10:24:25Z

Hm, github would be a nice idea, although I guess it is harder to find the actual patchset from github (for all the kernels) instead of just going to the website. I'll checkout your patch now!

matthiasbeyer · 2019-04-08T10:34:33Z

pkgs/os-specific/linux/kernel/patches.nix

+      '';
+    };
+  in rec {
+    patch = unpackedPatch;


Unfortunately (@worldofpeace) does the patchset not apply on the kernel sources.

I'm not sure why, though. Maybe the kernel is too new (as in patchlevel-version)?

[...] Hunk #1 succeeded at 155 (offset 24 lines). patching file sound/usb/line6/pcm.c patching file tools/objtool/Makefile Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file tools/objtool/Makefile.rej builder for '/nix/store/qb8k5whqxapcb3yknyqssfrfqpljif9p-linux-config-4.19.34.drv' failed with exit code 1 cannot build derivation '/nix/store/lsdl2wy98a73d1s7rvl4qknnjp2s2ha6-linux-4.19.34.drv': 1 dependencies couldn't be built

Hmm, I don't think the author keep these patches in sync for very long.
So we might only be able to do patches for the latest, or fetch from places that have corrected the patch so it can apply.

matthiasbeyer · 2019-04-08T10:35:39Z

@worldofpeace you're btw welcome to send me patches directly (as in "cherry-pick this commit") or tell me to pull from a branch of yours - no need to paste diffs here (which makes the whole conversation unnecessarily long).

matthiasbeyer · 2019-04-10T13:17:24Z

Here we go with another approach.

Tell me if this looks good for you and I'll rebase and remove the unnecessary commits.

matthiasbeyer · 2019-04-10T13:37:44Z

Hm, I do not understand the borg error message...

worldofpeace · 2019-04-10T13:40:57Z

@matthiasbeyer This sounds like it might work. Though the rev's are a branch, so it's probably not stable.

Maybe pin them to a revision, or apply the patches to the kernel sources that the fork is at.

worldofpeace · 2019-04-10T13:43:10Z

Hm, I do not understand the borg error message...

Maybe once we clean it up it'll magic resolve itself 😄

matthiasbeyer · 2019-04-10T14:13:21Z

Lets see...

matthiasbeyer · 2019-04-10T14:18:46Z

nope.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

matthiasbeyer · 2019-05-18T10:16:17Z

Any ideas here?

worldofpeace · 2019-05-18T20:10:38Z

The kernel built for me last time I checked. Though

Maybe pin them to a revision, or apply the patches to the kernel sources that the fork is at.

Still stands and eval is failing (you should probably do fetchFromGitHub not from args)

Also, since this is an older version of the kernels because the patches aren't kept in sync for long that can have security implications...

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 101-500 labels Apr 7, 2019

teto reviewed Apr 7, 2019

View reviewed changes

worldofpeace reviewed Apr 7, 2019

View reviewed changes

matthiasbeyer commented Apr 8, 2019

View reviewed changes

matthiasbeyer force-pushed the add-linux-ck branch from 42314b6 to f4746da Compare April 10, 2019 14:07

FRidh added the 6.topic: kernel label Apr 27, 2019

matthiasbeyer force-pushed the add-linux-ck branch from f4746da to 61dfb6d Compare May 2, 2019 14:06

ofborg bot removed the 6.topic: kernel label May 2, 2019

matthiasbeyer added 3 commits May 18, 2019 12:14

linux: kernel: Add kernel 4.14 with ck patchset

47b0957

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

linux: kernel: Add kernel 4.19 with ck patchset

b9df92a

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

linux: kernel: Add kernel 5.0 with ck patchset

6c8b2d2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

matthiasbeyer force-pushed the add-linux-ck branch from 5788a9f to 6c8b2d2 Compare May 18, 2019 10:15

matthiasbeyer closed this Nov 9, 2019

matthiasbeyer deleted the add-linux-ck branch November 9, 2019 16:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

linux: kernel: Add linux-ck for 4.14, 4.19 and 5.0 #59105

linux: kernel: Add linux-ck for 4.14, 4.19 and 5.0 #59105

matthiasbeyer commented Apr 7, 2019

teto Apr 7, 2019

teto commented Apr 7, 2019

matthiasbeyer commented Apr 7, 2019

vcunat commented Apr 7, 2019

worldofpeace Apr 7, 2019

matthiasbeyer Apr 8, 2019

matthiasbeyer Apr 8, 2019

matthiasbeyer commented Apr 8, 2019

worldofpeace commented Apr 8, 2019

matthiasbeyer commented Apr 8, 2019

matthiasbeyer Apr 8, 2019

matthiasbeyer Apr 8, 2019

worldofpeace Apr 8, 2019

matthiasbeyer commented Apr 8, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

worldofpeace commented Apr 10, 2019

worldofpeace commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented May 18, 2019

worldofpeace commented May 18, 2019

linux: kernel: Add linux-ck for 4.14, 4.19 and 5.0 #59105

linux: kernel: Add linux-ck for 4.14, 4.19 and 5.0 #59105

Conversation

matthiasbeyer commented Apr 7, 2019

Motivation for this change

Things done

teto Apr 7, 2019

Choose a reason for hiding this comment

teto commented Apr 7, 2019

matthiasbeyer commented Apr 7, 2019

vcunat commented Apr 7, 2019

worldofpeace Apr 7, 2019

Choose a reason for hiding this comment

matthiasbeyer Apr 8, 2019

Choose a reason for hiding this comment

matthiasbeyer Apr 8, 2019

Choose a reason for hiding this comment

matthiasbeyer commented Apr 8, 2019

worldofpeace commented Apr 8, 2019

matthiasbeyer commented Apr 8, 2019

matthiasbeyer Apr 8, 2019

Choose a reason for hiding this comment

matthiasbeyer Apr 8, 2019

Choose a reason for hiding this comment

worldofpeace Apr 8, 2019

Choose a reason for hiding this comment

matthiasbeyer commented Apr 8, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

worldofpeace commented Apr 10, 2019

worldofpeace commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented Apr 10, 2019

matthiasbeyer commented May 18, 2019

worldofpeace commented May 18, 2019