NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2025-01-07 12:11:28 +03:00
Code Issues Projects Releases Wiki Activity

kernel-builder: Fix correctness with makeFlags and menuconfig

Browse Source
This commit is contained in:
Samuel Dionne-Riel 2020-09-29 20:46:14 -04:00
parent 5b14ef0650
commit c708340e8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
overlay/mobile-nixos/kernel/builder.nix
View File

@ -279,7 +279,7 @@ let kernel = stdenv.mkDerivation {
sed -i"" -e 's/$< .*$(Kconfig)/echo "no-op"/' scripts/kconfig/Makefile sed -i"" -e 's/$< .*$(Kconfig)/echo "no-op"/' scripts/kconfig/Makefile
# Build the ...config application. # Build the ...config application.
make $buildFlags make $makeFlags "''${makeFlagsArray[@]}" $buildFlags
mv scripts/kconfig/Makefile.old scripts/kconfig/Makefile mv scripts/kconfig/Makefile.old scripts/kconfig/Makefile
) )
@ -329,7 +329,8 @@ let kernel = stdenv.mkDerivation {
export ARCH="${stdenv.hostPlatform.platform.kernelArch}" export ARCH="${stdenv.hostPlatform.platform.kernelArch}"
export KERNELVERSION="${version}" export KERNELVERSION="${version}"
cd "\$KERNEL_TREE" cd "\$KERNEL_TREE"
make run-nconfig "\$@" ${/* We're expanding the builder's makeFlags variable here. This is not a mistake. */""}
make $makeFlags run-nconfig "\$@"
EOF EOF
) )