diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-07-25 14:42:53 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-07-28 12:32:03 -0700 |
| commit | dbe0d20b573e7e4536169456cb55f691d5f678ec (patch) | |
| tree | cde36c0af8ba3fadf6e67b7bf258d65399a9b044 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | 93021f12c3bb97448bb40d75c29401d49333b531 (diff) | |
| download | nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar.gz nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar.bz2 nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar.lz nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar.xz nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.tar.zst nixpkgs-dbe0d20b573e7e4536169456cb55f691d5f678ec.zip | |
Revert "linuxManualConfig: don't build inside source tree"
This reverts commit d75cff2ee3bb6d91c818d43d1ba7603bb6dacd59.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 7 |
1 files 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 3480928aa5b..61013ef090a 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 |