From 12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 25 Jul 2023 14:42:43 -0700 Subject: Revert "linuxManualConfig: use the default make target" This reverts commit 41f788b1217b05d8661ebb77bfc9d9f3f65b5dd2. --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix') diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4005dda4374..d4eff7b7e45 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -199,14 +199,18 @@ let ''; buildFlags = [ - "DTC_FLAGS=-@" "KBUILD_BUILD_VERSION=1-NixOS" # 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; + + kernelConf.target + "vmlinux" # for "perf" and things like that + ] ++ optional isModular "modules" + ++ optionals buildDTBs ["dtbs" "DTC_FLAGS=-@"] + ++ extraMakeFlags; installFlags = [ "INSTALL_PATH=$(out)" -- cgit 1.4.1