split build and run scripts due to option conflicts

Remove -v from travis as it blew log length

run

@@ -1,77 +1,120 @@
 #!/usr/bin/env bash
+
 set -e
-arch='x86_64'
-extra_targets=''
-j="$(($(nproc) - 2))"
-x11=false
-v=0
-while getopts a:e:j:nt:v OPT; do
+
+# CLI handling.
+arch=x86_64
+debug=false
+debug_qemu=''
+kgdb=false
+nographic=false
+# norandmaps: Don't use address space randomization. Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space.
+# printk.time=y: log in format: "[time ] msg" for all printk messages.
+extra_append='norandmaps printk.devkmsg=on printk.time=y'
+extra_flags=''
+while getopts a:de:knqt:x OPT; do
   case "$OPT" in
-    'a')
+    a)
       arch="$OPTARG"
-    ;;
-    'j')
-      j="$OPTARG"
-    ;;
-    't')
-      extra_targets="$extra_args $OPTARG"
-    ;;
-    'x')
-      x11=true
-    ;;
-    'v')
-      v=1
-    ;;
+      ;;
+    d)
+      debug=true
+      extra_flags="$extra_flags -S -s"
+      ;;
+    e)
+      extra_append="$extra_append $OPTARG"
+      ;;
+    k)
+      debug=true
+      extra_append="$extra_append kgdbwait"
+      # For those who want to try KDB.
+      #extra_append="$extra_append kgdbwait kgdboc=kbd"
+      extra_flags="$extra_flags -serial tcp::1234,server,nowait"
+      kgdb=true
+      ;;
+    n)
+      extra_append="$extra_append console=ttyS0"
+      extra_flags="$extra_flags -nographic"
+      nographic=true
+      ;;
+    q)
+      debug_qemu='gdb -q -ex start --args'
+      ;;
   esac
 done
+shift "$(($OPTIND - 1))"
+extra_flags="$extra_flags $@"
+
+buildroot_out_dir="./buildroot/output.${arch}~"
+images_dir="$buildroot_out_dir/images"
+qemu_common="\
+$debug_qemu \
+$buildroot_out_dir/host/usr/bin/qemu-system-${arch} \
+-m 128M \
+-monitor telnet::45454,server,nowait \
+-netdev user,hostfwd=tcp::45455-:45455,id=net0 \
+-smp 1 \
+"
+# The base QEMU commands are found under board/qemu/*/readme.tx
 case "$arch" in
-  'x86_64')
-    defconfig='qemu_x86_64_defconfig'
+  x86_64)
+    if $kgdb; then
+      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 \
+-device virtio-net-pci,netdev=net0 \
+-drive file=${images_dir}/rootfs.ext2,if=virtio,format=raw \
+-kernel ${images_dir}/bzImage \
+$extra_flags \
+"
   ;;
-  'arm')
-    # qemu_arm_vexpress_defconfig required a newer QEMU than 2.0.0 on a Ubuntu host.
-    # so let's stick to versatile for now.
-    defconfig='qemu_arm_versatile_defconfig'
+  arm)
+    if $kgdb; then
+      extra_append="$extra_append kgdboc=ttyAMA0,115200"
+    fi
+    cmd="$qemu_common \
+-M versatilepb \
+-append 'root=/dev/sda $extra_append' \
+-device rtl8139,netdev=net0 \
+-drive file=${images_dir}/rootfs.ext2,if=scsi,format=raw \
+-dtb ${images_dir}/versatile-pb.dtb \
+-kernel ${images_dir}/zImage \
+-serial stdio \
+$extra_flags \
+"
   ;;
-  'aarch64')
-    defconfig='qemu_aarch64_virt_defconfig'
+  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=net0 \
+-drive file=${images_dir}/rootfs.cpio,if=scsi,format=raw \
+-kernel ${images_dir}/Image \
+-nographic \
+-serial stdio \
+$extra_flags \
+"
   ;;
-  'mips64')
-    defconfig='qemu_mips64r6_malta_defconfig'
+  mips64)
+    cmd="$qemu_common \
+-M malta \
+-append 'root=/dev/hda $extra_append' \
+-cpu I6400 \
+-device pcnet \
+-drive file=${images_dir}/rootfs.ext2,format=raw \
+-kernel ${images_dir}/vmlinux \
+-nographic \
+$extra_flags \
+"
   ;;
 esac
-
-cd kernel_module
-./make-host.sh -j "$j" clean
-cd ../buildroot
-for p in $(find '../buildroot_patches/' -maxdepth 1 -name '*.patch' -print); do
-    patch -N -r - -p 1 <"$p" || :
-done
-outdir="output.${arch}~"
-make O="$outdir" BR2_EXTERNAL="$(pwd)/../kernel_module" "$defconfig"
-# TODO Can't get rid of this for now.
-# http://stackoverflow.com/questions/44078245/is-it-possible-to-use-config-fragments-with-buildroots-config
-cat ../buildroot_config_fragment >> "${outdir}/.config"
-if $x11; then
-  cat ../buildroot_config_fragment_x11 >> "${outdir}/.config"
-fi
-make O="$outdir" olddefconfig
-# HOST_QEMU_OPTS is a hack that happens to work because the QEMU package luckly uses += at all times.
-# 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
-time \
-  env \
-  -u LD_LIBRARY_PATH \
-  make \
-  O="$outdir" \
-  BR2_JLEVEL="$j" \
-  HOST_QEMU_OPTS="--enable-debug --enable-sdl --extra-cflags='-DDEBUG_PL061=1' --with-sdlabi=2.0 --enable-trace-backends=simple" \
-  V="$v" \
-  kernel_module-rebuild \
-  $extra_targets \
-  all \
-;
-cd ..
-./runqemu "$@"
+echo "$cmd"
+eval "$cmd"