cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

use pre-patched kernel source instead of patching ourselves

Browse source 
nix strips FHS before patching, causing the patch for some versions to fail
This commit is contained in:
LavaDesu 2021-06-28 10:53:51 +07:00
parent df5bfd14d6
commit 264b62ca6a
Signed by: cilly
GPG key ID: 6500251E087653C9
2 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/linux-tkg/default.nix
View file

@ -42,8 +42,6 @@
, ... , ...
} @ args: } @ args:
let let
tkg = "2da317c20ed6f70085b195639b9aad2cacf31ab5";
sources = import ./sources.nix { inherit fetchFromGitHub lib version; }; sources = import ./sources.nix { inherit fetchFromGitHub lib version; };
boolToKernel = bool: with lib.kernel; if bool then yes else no; boolToKernel = bool: with lib.kernel; if bool then yes else no;
@ -325,11 +323,6 @@ in buildLinux(args // rec {
} // flattenedConfig } // flattenedConfig
// extraConfig); // extraConfig);
kernelPatches = #args.kernelPatches kernelPatches = tkgPatches;
[{
name = "patch-${version}";
patch = sources.patchSrc;
}]
++ tkgPatches;
src = sources.kernelSrc; src = sources.kernelSrc;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

21
packages/linux-tkg/sources.nix
View file

@ -3,26 +3,23 @@ let
vMap = { vMap = {
"5.4" = { "5.4" = {
version = "5.4.128"; version = "5.4.128";
baseHash = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz"; hash = "1arrpskxkkl6vb06d4y4xvfy1355mjk5ac5sp66657kbh6xswm1v";
patchHash = "04ylr4f4amzviqljhc6i79dqhjmjx45shf0rply1v5zqlfndb459";
}; };
"5.10" = { "5.10" = {
version = "5.10.46"; version = "5.10.46";
baseHash = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw"; hash = "058lvk0hc6qk3l485kda7cxkdrjk1kd0f75cp7pmnckbkjij54an";
patchHash = "0jl31aayxyns3pkvm9mycvwakg2i45win9nfbirhcz7z5gfsa7fg";
}; };
"5.12" = { "5.12" = {
version = "5.12.13"; version = "5.12.13";
baseHash = "0rn3z942vjc7bixjw066rm6kcr0x0wzgxqfq1f6xd113pzrgc3bx"; hash = "0mfjkncsa7vq13689dzzwms6wzsaj347qm1vf7k82nb3wp6myj5g";
patchHash = "17d38hns5qfbw1pajpa5y38v86r49nqnw7a3pwsay5fapj69z8w4";
}; };
}; };
tkg = fetchFromGitHub { tkg = fetchFromGitHub {
owner = "Frogging-Family"; owner = "Frogging-Family";
repo = "linux-tkg"; repo = "linux-tkg";
rev = "2da317c20ed6f70085b195639b9aad2cacf31ab5"; rev = "c93cfdd20da1cf3b0860895c278b5a4676ccb057";
sha256 = "06a5fpafids8nc550pcsyvar2igphi6bpghqzl6cp48hg6p2g07w"; sha256 = "0xpkdjq2ickhb8pqzqv5avjmrg3qyzryy8qv1wr9dxpkx197swdx";
}; };
ver = ver =
@ -34,11 +31,7 @@ in rec {
fullVersion = ver.version; fullVersion = ver.version;
kernelSrc = builtins.fetchurl { kernelSrc = builtins.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${fullVersion}.tar.xz";
sha256 = ver.baseHash; sha256 = ver.hash;
};
patchSrc = builtins.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${fullVersion}.xz";
sha256 = ver.patchHash;
}; };
} }