dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "linuxManualConfig: install GDB scripts"

Browse Source 
This reverts commit d57568fcad.
This commit is contained in:
Adam Joseph 2023-07-25 14:42:37 -07:00
parent 37eb25a428
commit 3aff655361
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -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
@ -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 = {

18
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -278,6 +278,7 @@ let
];
postInstall = optionalString isModular ''
cp vmlinux $dev/
if [ -z "''${dontStrip-}" ]; then
installFlagsArray+=("INSTALL_MOD_STRIP=1")
fi
@ -297,16 +298,12 @@ let
# from a `try-run` call from the Makefile
rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d
# Keep some extra files
for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o \
scripts/gdb/linux vmlinux vmlinux-gdb.py
do
if [ -e "$buildRoot/$f" ]; then
mkdir -p "$(dirname "$dev/lib/modules/${modDirVersion}/build/$f")"
cp -HR $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
# Keep some extra files on some arches (powerpc, aarch64)
for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
if [ -f "$buildRoot/$f" ]; then
cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
fi
done
ln -s $dev/lib/modules/${modDirVersion}/build/vmlinux $dev
# !!! No documentation on how much of the source tree must be kept
# If/when kernel builds fail due to missing files, you can add
@ -349,11 +346,6 @@ let
sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'
'';
preFixup = ''
# Don't strip $dev/lib/modules/*/vmlinux
stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)"
'';
requiredSystemFeatures = [ "big-parallel" ];
meta = {