diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2021-01-24 13:03:31 -0500 |
|---|---|---|
| committer | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2021-01-24 18:17:56 -0500 |
| commit | 071750d412c5ccbbbc84606c2f871881d97f067e (patch) | |
| tree | dc733d7ae9afe67d4174ac2988eb5a83478a34e3 /pkgs | |
| parent | e80850fe42c61d915162403a32cf20601ba61034 (diff) | |
linux-hardened: Remove tag patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch deleted file mode 100644 index ff8a3a127973..000000000000 --- a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/localversion-hardened b/localversion-hardened -new file mode 100644 -index 0000000000..e578045860 ---- /dev/null -+++ b/localversion-hardened -@@ -0,0 +1 @@ -+-hardened diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6b1568013b92..e7667bf1bc29 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -33,11 +33,6 @@ cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = { - name = "tag-hardened"; - patch = ./hardened/tag-hardened.patch; - }; - hardened = let mkPatch = kernelVersion: src: { name = lib.removeSuffix ".patch" src.name; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38663fbe95bc..19f6c27b1e0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19265,10 +19265,9 @@ in inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.tag_hardened kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened"; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; isHardened = true; }); |