git.iko.soy/typeable/nixpkgs
on master help sign in
linux-hardened: Track extra version

Fixes #108707

commit4312cd74f13574cbe6a13c33064482964e4c5853 authorTim Steinbach <tim@nequissimus.com> dateThu 7 Jan 2021, 14:39 (6 years ago) parent58514b3
4 files changed+15−6
pkgs/os-specific/linux/kernel/hardened/patches.json+5 pkgs/os-specific/linux/kernel/hardened/update.py+7−4 pkgs/os-specific/linux/kernel/patches.nix+2−1 pkgs/top-level/all-packages.nix+1−1
pkgs/os-specific/linux/kernel/hardened/patches.json+5
@@ -1,25 +1,30 @@
11{
22 "4.14": {
3+ "extra": "",
34 "name": "linux-hardened-4.14.213.a.patch",
45 "sha256": "0lkjgg6cbsaiypxij7p00q3y094qf0h172hc2p7wgy39777b45a7",
56 "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.213.a/linux-hardened-4.14.213.a.patch"
67 },
78 "4.19": {
9+ "extra": ".a",
810 "name": "linux-hardened-4.19.165.a.patch",
911 "sha256": "06v34jaj4jg6f3v05wbkkfnr69ahxqyyq0gam4ma3wgm74x6cf3s",
1012 "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.165.a/linux-hardened-4.19.165.a.patch"
1113 },
1214 "5.10": {
15+ "extra": ".a",
1316 "name": "linux-hardened-5.10.5.a.patch",
1417 "sha256": "1fq2n60brhi6wjazkdgj2aqc4maskvlymbznl03hvj0x5kahjxvx",
1518 "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.5.a/linux-hardened-5.10.5.a.patch"
1619 },
1720 "5.4": {
21+ "extra": ".a",
1822 "name": "linux-hardened-5.4.87.a.patch",
1923 "sha256": "01hpww6lm00iry8z4z86hh86x66h3xbmxknxhmmhh2zwz6ahkmfd",
2024 "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.87.a/linux-hardened-5.4.87.a.patch"
2125 },
2226 "5.9": {
27+ "extra": "",
2328 "name": "linux-hardened-5.9.16.a.patch",
2429 "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw",
2530 "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch"
pkgs/os-specific/linux/kernel/hardened/update.py+7−4
@@ -31,7 +31,7 @@ VersionComponent = Union[int, str]
3131Version = List[VersionComponent]
3232
3333
34−Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str})
34+Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str, "extra": str})
3535
3636
3737@dataclass
@@ -99,7 +99,10 @@ def verify_openpgp_signature(
9999 return False
100100
101101
102−def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]:
102+def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
103+ release = release_info.release
104+ extra = f'.{release_info.version[-1]}'
105+
103106 def find_asset(filename: str) -> str:
104107 try:
105108 it: Iterator[str] = (
@@ -130,7 +133,7 @@ def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]:
130133 if not sig_ok:
131134 return None
132135
133− return Patch(name=patch_filename, url=patch_url, sha256=sha256)
136+ return Patch(name=patch_filename, url=patch_url, sha256=sha256, extra=extra)
134137
135138
136139def parse_version(version_str: str) -> Version:
@@ -252,7 +255,7 @@ for kernel_key in sorted(releases.keys()):
252255 update = True
253256
254257 if update:
255− patch = fetch_patch(name=name, release=release)
258+ patch = fetch_patch(name=name, release_info=release_info)
256259 if patch is None:
257260 failures = True
258261 else:
pkgs/os-specific/linux/kernel/patches.nix+2−1
@@ -41,7 +41,8 @@
4141 hardened = let
4242 mkPatch = kernelVersion: src: {
4343 name = lib.removeSuffix ".patch" src.name;
44− patch = fetchurl src;
44+ patch = fetchurl (lib.filterAttrs (k: v: k != "extra") src);
45+ extra = src.extra;
4546 };
4647 patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json);
4748 in lib.mapAttrs mkPatch patches;
pkgs/top-level/all-packages.nix+1−1
@@ -19014,7 +19014,7 @@ in
1901419014 kernelPatches.tag_hardened
1901519015 kernelPatches.hardened.${kernel.meta.branch}
1901619016 ];
19017− modDirVersionArg = kernel.modDirVersion + "-hardened";
19017+ modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened";
1901819018 isHardened = true;
1901919019 });
1902019020