summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/manual-config.nix
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-07-25 14:42:43 -0700
committerAdam Joseph <adam@westernsemico.com>2023-07-28 12:32:03 -0700
commit12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d (patch)
treeaf2b7002e0da6b7f6239fdfeaaf0e33af7c64c78 /pkgs/os-specific/linux/kernel/manual-config.nix
parent3aff6553615124198331f845ce3f07ddd731c2c5 (diff)
downloadnixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar.gz
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar.bz2
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar.lz
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar.xz
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.tar.zst
nixpkgs-12a06dc2b8507b01c5ba96f94e8f4bf241df6a0d.zip
Revert "linuxManualConfig: use the default make target"
This reverts commit 41f788b1217b05d8661ebb77bfc9d9f3f65b5dd2.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix8
1 files changed, 6 insertions, 2 deletions
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)"