mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 18:17:21 +03:00
Merge pull request #178256 from misuzu/btf-32bit
linuxPackages: unbreak new kernels on 32-bit platforms
This commit is contained in:
commit
a1e3a1dfc0
@ -41,7 +41,8 @@ let
|
|||||||
(whenBetween "5.2" "5.18" yes)
|
(whenBetween "5.2" "5.18" yes)
|
||||||
];
|
];
|
||||||
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
|
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
|
||||||
DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
|
# Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22`
|
||||||
|
DEBUG_INFO_BTF = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes));
|
||||||
BPF_LSM = whenAtLeast "5.7" (option yes);
|
BPF_LSM = whenAtLeast "5.7" (option yes);
|
||||||
DEBUG_KERNEL = yes;
|
DEBUG_KERNEL = yes;
|
||||||
DEBUG_DEVRES = no;
|
DEBUG_DEVRES = no;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
@ -11,8 +11,6 @@ buildLinux (args // rec {
|
|||||||
# branchVersion needs to be x.y
|
# branchVersion needs to be x.y
|
||||||
extraMeta.branch = versions.majorMinor version;
|
extraMeta.branch = versions.majorMinor version;
|
||||||
|
|
||||||
extraMeta.broken = stdenv.isi686;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb";
|
sha256 = "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb";
|
||||||
|
@ -571,7 +571,7 @@ in {
|
|||||||
});
|
});
|
||||||
|
|
||||||
packageAliases = {
|
packageAliases = {
|
||||||
linux_default = if stdenv.hostPlatform.is32bit then packages.linux_5_10 else packages.linux_5_15;
|
linux_default = packages.linux_5_15;
|
||||||
# Update this when adding the newest kernel major version!
|
# Update this when adding the newest kernel major version!
|
||||||
linux_latest = packages.linux_5_18;
|
linux_latest = packages.linux_5_18;
|
||||||
linux_mptcp = packages.linux_mptcp_95;
|
linux_mptcp = packages.linux_mptcp_95;
|
||||||
|
Loading…
Reference in New Issue
Block a user