From d75cff2ee3bb6d91c818d43d1ba7603bb6dacd59 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 18:40:11 +0000 Subject: [PATCH] linuxManualConfig: don't build inside source tree We can avoid the need to explicitly exclude it later if we just put it somewhere else to begin with. --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b01805e83da9..8386a555311d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -156,8 +156,7 @@ let configurePhase = '' runHook preConfigure - mkdir build - export buildRoot="$(pwd)/build" + export buildRoot=$(mktemp -d) echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD" @@ -275,8 +274,8 @@ let 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/' \ + (cd "$NIX_BUILD_TOP" && cd "$sourceRoot" && + rsync --archive --prune-empty-dirs \ * $dev/lib/modules/${modDirVersion}/source/) cd $dev/lib/modules/${modDirVersion}/source