linux-copperhead: 4.16.12.a -> 4.16.13.a
This commit is contained in:
parent
c548814b81
commit
5c4a404b0d
2571
pkgs/os-specific/linux/kernel/copperhead-4-16.patch
Normal file
2571
pkgs/os-specific/linux/kernel/copperhead-4-16.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -6,7 +6,7 @@ buildLinux (args // rec {
|
||||
version = "4.16.13";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
|
||||
|
@ -1,30 +0,0 @@
|
||||
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "4.16.12";
|
||||
revision = "a";
|
||||
sha256 = "0gkgvhh2v5lca67xjmq512mqnfbln6lkk6hgigby2406b9w1b0sd";
|
||||
|
||||
# modVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
|
||||
|
||||
modDirVersion = "${modVersion}-hardened";
|
||||
in
|
||||
buildLinux (args // {
|
||||
inherit modDirVersion;
|
||||
|
||||
version = "${version}-${revision}";
|
||||
extraMeta.branch = "${branchVersion}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit sha256;
|
||||
owner = "copperhead";
|
||||
repo = "linux-hardened";
|
||||
rev = "${version}.${revision}";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
@ -28,6 +28,11 @@ rec {
|
||||
patch = ./tag-hardened.patch;
|
||||
};
|
||||
|
||||
copperhead_4_16 = rec {
|
||||
name = "copperhead-4.16";
|
||||
patch = ./copperhead-4-16.patch;
|
||||
};
|
||||
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6
|
||||
iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec {
|
||||
name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command";
|
||||
|
@ -13465,13 +13465,13 @@ with pkgs;
|
||||
];
|
||||
};
|
||||
|
||||
linux_copperhead_stable = callPackage ../os-specific/linux/kernel/linux-copperhead-stable.nix {
|
||||
kernelPatches = with kernelPatches; [
|
||||
bridge_stp_helper
|
||||
modinst_arg_list_too_long
|
||||
tag_hardened
|
||||
];
|
||||
};
|
||||
linux_copperhead_stable = (linux_4_16.override {
|
||||
kernelPatches = linux_4_16.kernelPatches ++ [
|
||||
kernelPatches.copperhead_4_16
|
||||
kernelPatches.tag_hardened
|
||||
];
|
||||
modDirVersionArg = linux_4_16.modDirVersion + "-hardened";
|
||||
});
|
||||
|
||||
# linux mptcp is based on the 4.4 kernel
|
||||
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
|
||||
|
Loading…
Reference in New Issue
Block a user