Skip to content

linuxManualConfig: revert #221707 #245449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
14 commits merged into from Jul 28, 2023
Merged

linuxManualConfig: revert #221707 #245449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c200f5e
partial revert of f3719756b550
Jul 25, 2023
17d25bf
Revert "linuxManualConfig: restore functionality of isModular and bui…
Jul 25, 2023
007f794
Revert "lib/systems: strip kernel to avoid reference cycles"
Jul 25, 2023
c801a96
Revert "linuxManualConfig: set badPlatforms"
Jul 25, 2023
eecef61
Revert "linux.configfile: remove unused kernelTarget attr"
Jul 25, 2023
06f20db
Revert "linuxManualConfig: always depend on ubootTools"
Jul 25, 2023
ddaa949
Revert "linux: default stdenv.hostPlatform.linux-kernel"
Jul 25, 2023
479dd15
Revert "linux: manual-config: use a non-random path for $buildRoot"
Jul 25, 2023
92f7bec
Revert "linuxManualConfig: fix inaccurate FIXME comment"
Jul 25, 2023
37eb25a
Revert "linuxManualConfig: get rid of drvAttrs"
Jul 25, 2023
3aff655
Revert "linuxManualConfig: install GDB scripts"
Jul 25, 2023
12a06dc
Revert "linuxManualConfig: use the default make target"
Jul 25, 2023
93021f1
Revert "linuxManualConfig: unpack directly into $dev"
Jul 25, 2023
dbe0d20
Revert "linuxManualConfig: don't build inside source tree"
Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ let

debug = {
# Necessary for BTF
DEBUG_INFO = yes;
DEBUG_INFO = mkMerge [
(whenOlder "5.2" (if (features.debug or false) then yes else no))
(whenBetween "5.2" "5.18" yes)
];
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
# Reduced debug info conflict with BTF and have been enabled in
# aarch64 defconfig since 5.13
Expand All @@ -59,8 +62,6 @@ let
SUNRPC_DEBUG = yes;
# Provide access to tunables like sched_migration_cost_ns
SCHED_DEBUG = yes;

GDB_SCRIPTS = yes;
};

power-management = {
Expand Down
9 changes: 6 additions & 3 deletions pkgs/os-specific/linux/kernel/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
# symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name or "" != "pc"
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc"
, extraMeta ? {}

, isZen ? false
, isLibre ? false
, isHardened ? false

# easy overrides to stdenv.hostPlatform.linux-kernel members
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
, kernelArch ? stdenv.hostPlatform.linuxArch
, kernelTests ? []
Expand Down Expand Up @@ -128,8 +128,11 @@ let
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ lib.optional (lib.versionAtLeast version "5.2") pahole;

platformName = stdenv.hostPlatform.linux-kernel.name;
# e.g. "defconfig"
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
# e.g. "bzImage"
kernelTarget = stdenv.hostPlatform.linux-kernel.target;

makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags
++ extraMakeFlags;
Expand Down
Loading