From d67626255ef867879f8d54cd6540dc43bcfbc769 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Wed, 18 Oct 2017 14:45:44 +0100
Subject: [PATCH] run: time before env to use bash builtin and get decent
 format, runqemu: remove spaces from cmd to make copy and paste on SO easier

---
 run     |  4 +--
 runqemu | 76 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/run b/run
index 3f836f1..c053bf0 100755
--- a/run
+++ b/run
@@ -45,9 +45,9 @@ make O="$outdir" olddefconfig
 # It shouldn't be necessary in the first place: https://bugs.busybox.net/show_bug.cgi?id=9936
 # Even if were an autotools package, there is no general way currently to pass extra configs to it:
 # https://stackoverflow.com/questions/44341188/how-to-pass-extra-custom-configure-autotools-options-to-a-buildroot-package/44341225#44341225
-env \
+time \
+  env \
   -u LD_LIBRARY_PATH \
-  time \
   make \
   O="$outdir" \
   BR2_JLEVEL="$(($(nproc) - 2))" \
diff --git a/runqemu b/runqemu
index f7e75e6..f0050d9 100755
--- a/runqemu
+++ b/runqemu
@@ -62,59 +62,59 @@ case "$arch" in
       extra_append="$extra_append kgdboc=ttyS0,115200"
     fi
     cmd="$qemu_common \
-      -M pc \
-      -append 'root=/dev/vda nopat $extra_append' \
-      -device edu \
-      -device lkmc_pci_min \
-      -drive file=${images_dir}/rootfs.ext2,if=virtio,format=raw \
-      -kernel ${images_dir}/bzImage \
-      -net nic,model=virtio \
-      $extra_flags
-    "
+-M pc \
+-append 'root=/dev/vda nopat $extra_append' \
+-device edu \
+-device lkmc_pci_min \
+-drive file=${images_dir}/rootfs.ext2,if=virtio,format=raw \
+-kernel ${images_dir}/bzImage \
+-net nic,model=virtio \
+$extra_flags \
+"
   ;;
   'arm')
     if $kgdb; then
       extra_append="$extra_append kgdboc=ttyAMA0,115200"
     fi
     cmd="$qemu_common \
-      -M versatilepb \
-      -append 'root=/dev/sda $extra_append' \
-      -drive file=${images_dir}/rootfs.ext2,if=scsi,format=raw \
-      -dtb ${images_dir}/versatile-pb.dtb \
-      -kernel ${images_dir}/zImage \
-      -net nic,model=rtl8139 \
-      -serial stdio \
-      $extra_flags
-    "
+-M versatilepb \
+-append 'root=/dev/sda $extra_append' \
+-drive file=${images_dir}/rootfs.ext2,if=scsi,format=raw \
+-dtb ${images_dir}/versatile-pb.dtb \
+-kernel ${images_dir}/zImage \
+-net nic,model=rtl8139 \
+-serial stdio \
+$extra_flags \
+"
   ;;
   'aarch64')
     if $kgdb; then
       extra_append="$extra_append kgdboc=ttyAMA0,115200"
     fi
     cmd="$qemu_common \
-      -M virt \
-      -append 'root=/dev/sda $extra_append' \
-      -cpu cortex-a57 \
-      -device virtio-net-device,netdev=eth0 \
-      -drive file=${images_dir}/rootfs.cpio,if=scsi,format=raw \
-      -kernel ${images_dir}/Image \
-      -netdev user,id=eth0 \
-      -nographic \
-      -serial stdio \
-      $extra_flags
-    "
+-M virt \
+-append 'root=/dev/sda $extra_append' \
+-cpu cortex-a57 \
+-device virtio-net-device,netdev=eth0 \
+-drive file=${images_dir}/rootfs.cpio,if=scsi,format=raw \
+-kernel ${images_dir}/Image \
+-netdev user,id=eth0 \
+-nographic \
+-serial stdio \
+$extra_flags \
+"
   ;;
   'mips64')
     cmd="$qemu_common \
-      -M malta \
-      -append 'root=/dev/hda $extra_append' \
-      -cpu I6400 \
-      -drive file=${images_dir}/rootfs.ext2,format=raw \
-      -kernel ${images_dir}/vmlinux \
-      -nographic \
-      -net nic,model=pcnet \
-      $extra_flags
-    "
+-M malta \
+-append 'root=/dev/hda $extra_append' \
+-cpu I6400 \
+-drive file=${images_dir}/rootfs.ext2,format=raw \
+-kernel ${images_dir}/vmlinux \
+-nographic \
+-net nic,model=pcnet \
+$extra_flags \
+"
   ;;
 esac
 echo "$cmd"