diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/build-support | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index ddb549a2a136b..894ea95b5fa02 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -46,9 +46,9 @@ while [ $n -lt ${#params[*]} ]; do isCpp=1 elif [ "$p" = -nostdlib ]; then isCpp=-1 - elif [ "${i:0:1}" != - ]; then + elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 - elif [ "$i" = -m32 ]; then + elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9d9974660a1d4..dd093dfc2ca7b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -66,6 +66,7 @@ rec { mknod -m 666 ${dev}/random c 1 8 mknod -m 666 ${dev}/urandom c 1 9 mknod -m 666 ${dev}/tty c 5 0 + mknod -m 666 ${dev}/ttyS0 c 4 64 mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR @@ -208,7 +209,7 @@ rec { export PATH=/bin:/usr/bin:${coreutils}/bin echo "Starting interactive shell..." echo "(To run the original builder: \$origBuilder \$origArgs)" - exec ${bash}/bin/sh + exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/ttyS0 &> /dev/ttyS0 fi ''; @@ -219,7 +220,7 @@ rec { -nographic -no-reboot \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ + -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ |