Skip to content
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

Jump to bottom

linuxManualConfig: install GDB scripts #221707

Merged
merged 4 commits into from
Mar 20, 2023
Merged

linuxManualConfig: install GDB scripts #221707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d75cff2
linuxManualConfig: don't build inside source tree
alyssais Mar 17, 2023
7de3f08
linuxManualConfig: unpack directly into $dev
alyssais Mar 17, 2023
41f788b
linuxManualConfig: use the default make target
alyssais Mar 19, 2023
d57568f
linuxManualConfig: install GDB scripts
alyssais Mar 17, 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: 3 additions & 4 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,10 +36,7 @@ let

debug = {
# Necessary for BTF
DEBUG_INFO = mkMerge [
(whenOlder "5.2" (if (features.debug or false) then yes else no))
(whenBetween "5.2" "5.18" yes)
];
DEBUG_INFO = 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 @@ -62,6 +59,8 @@ let
SUNRPC_DEBUG = yes;
# Provide access to tunables like sched_migration_cost_ns
SCHED_DEBUG = yes;

GDB_SCRIPTS = yes;
};

power-management = {
Expand Down
55 changes: 36 additions & 19 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,20 @@ let
hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
});

preUnpack = ''
# The same preUnpack is used to build the configfile,
# which does not have $dev.
if [ -n "$dev" ]; then
mkdir -p $dev/lib/modules/${modDirVersion}
cd $dev/lib/modules/${modDirVersion}
fi
'';

postUnpack = ''
mv -Tv "$sourceRoot" source 2>/dev/null || :
export sourceRoot=$PWD/source
'';

postPatch = ''
sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

Expand Down Expand Up @@ -156,8 +170,7 @@ let
configurePhase = ''
runHook preConfigure

mkdir build
export buildRoot="$(pwd)/build"
export buildRoot=$(mktemp -d)

echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"

Expand Down Expand Up @@ -185,12 +198,14 @@ let
'';

buildFlags = [
"DTC_FLAGS=-@"
alyssais marked this conversation as resolved.
Show resolved Hide resolved
"KBUILD_BUILD_VERSION=1-NixOS"
kernelConf.target
"vmlinux" # for "perf" and things like that
] ++ optional isModular "modules"
Comment on lines -190 to -191
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR inadvertently destroyed the ability to build a kernel without the modules, which is a much faster build.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#244447

++ optionals buildDTBs ["dtbs" "DTC_FLAGS=-@"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

likewise with buildDTBs

++ extraMakeFlags;

# Set by default in the kernel since a73619a845d5,
# replicated here to apply to older versions.
# Makes __FILE__ relative to the build directory.
"KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/="
] ++ extraMakeFlags;

installFlags = [
"INSTALL_PATH=$(out)"
Expand Down Expand Up @@ -262,8 +277,6 @@ let
];

postInstall = optionalString isModular ''
mkdir -p $dev
cp vmlinux $dev/
if [ -z "''${dontStrip-}" ]; then
installFlagsArray+=("INSTALL_MOD_STRIP=1")
fi
Expand All @@ -272,12 +285,7 @@ let
unlink $out/lib/modules/${modDirVersion}/build
unlink $out/lib/modules/${modDirVersion}/source

mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}

# To save space, exclude a bunch of unneeded stuff when copying.
(cd .. && rsync --archive --prune-empty-dirs \
--exclude='/build/' \
* $dev/lib/modules/${modDirVersion}/source/)
mkdir $dev/lib/modules/${modDirVersion}/build

cd $dev/lib/modules/${modDirVersion}/source

Expand All @@ -288,12 +296,16 @@ let
# from a `try-run` call from the Makefile
rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d

# 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
# 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
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
Expand Down Expand Up @@ -336,6 +348,11 @@ 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 = {
Expand Down