From 41f788b1217b05d8661ebb77bfc9d9f3f65b5dd2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Mar 2023 23:55:12 +0000 Subject: linuxManualConfig: use the default make target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've basically been reimplementing this — by default it contains vmlinux, dtbs (on applicable architectures), modules, and architecture specific stuff like $(KBUILD_IMAGE) and a couple of other miscellaneous files. --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 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 babc7607b94..fa21ab3b615 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,18 +198,14 @@ 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)/=" - - kernelConf.target - "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules" - ++ optionals buildDTBs ["dtbs" "DTC_FLAGS=-@"] - ++ extraMakeFlags; + ] ++ extraMakeFlags; installFlags = [ "INSTALL_PATH=$(out)" -- cgit 1.4.1