From dbe0d20b573e7e4536169456cb55f691d5f678ec Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 25 Jul 2023 14:42:53 -0700 Subject: [PATCH] Revert "linuxManualConfig: don't build inside source tree" This reverts commit d75cff2ee3bb6d91c818d43d1ba7603bb6dacd59. --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3480928aa5b9..61013ef090af 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -157,7 +157,8 @@ let configurePhase = '' runHook preConfigure - export buildRoot=$(mktemp -d) + mkdir build + export buildRoot="$(pwd)/build" echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD" @@ -275,8 +276,8 @@ let mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} # To save space, exclude a bunch of unneeded stuff when copying. - (cd "$NIX_BUILD_TOP" && cd "$sourceRoot" && - rsync --archive --prune-empty-dirs \ + (cd .. && rsync --archive --prune-empty-dirs \ + --exclude='/build/' \ * $dev/lib/modules/${modDirVersion}/source/) cd $dev/lib/modules/${modDirVersion}/source