From 9a1426a16e7c1af3597132ca1d3df71dbb76b29f Mon Sep 17 00:00:00 2001
From: Mehran-Baghi <1mehranbaghi@gmail.com>
Date: Thu, 2 Jan 2020 17:53:48 +0330
Subject: [PATCH 1/5] Use the host's arch name in the output directory

"mkroot.sh" puts the build output in a "host" directory if
it doesn't get a CROSS_SHORT env.
So a simple "./mkroot.sh kernel" and "run.sh host" gives:
"./run.sh: line 14: ./qemu-host.sh: No such file or directory"
---
 mkroot.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mkroot.sh b/mkroot.sh
index aa8b538..0bd0d43 100755
--- a/mkroot.sh
+++ b/mkroot.sh
@@ -63,14 +63,15 @@ fi
 
 # Work out absolute paths to working dirctories (can override on cmdline)
 TOP="$PWD"
+HOST=$(uname -m)
 [ -z "$BUILD" ] && BUILD="$TOP/build"
 [ -z "$DOWNLOAD" ] && DOWNLOAD="$TOP/download"
 [ -z "$AIRLOCK" ] && AIRLOCK="$TOP/airlock"
-[ -z "$OUTPUT" ] && OUTPUT="$TOP/output/${CROSS_SHORT:-host}"
+[ -z "$OUTPUT" ] && OUTPUT="$TOP/output/${CROSS_SHORT:-${HOST}}"
 [ -z "$ROOT" ] && ROOT="$OUTPUT/${CROSS_BASE}root"
 
 [ -z "$N" ] && rm -rf "$ROOT"
-MYBUILD="$BUILD/${CROSS_BASE:-host-}tmp"
+MYBUILD="$BUILD/${CROSS_BASE:-${HOST}-}tmp"
 mkdir -p "$MYBUILD" "$DOWNLOAD" || exit 1
 
 ### Functions to download, extract, and clean up after source packages.

From c1de34c6130308a0790492b115715e35772bc517 Mon Sep 17 00:00:00 2001
From: Mehran-Baghi <1mehranbaghi@gmail.com>
Date: Thu, 2 Jan 2020 19:29:57 +0330
Subject: [PATCH 2/5] Run the single arch if no argument is provided

This is a convenience wrapper after all!
---
 run.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/run.sh b/run.sh
index fa76ff1..225ed27 100755
--- a/run.sh
+++ b/run.sh
@@ -4,11 +4,16 @@
 
 if [ $# -lt 1 ]
 then
-  ls output | grep -v '[.]failed' | xargs
-  exit
+  if [ $(ls -1 output | wc -l) -eq 1 ]
+  then
+    ARCH=$(ls -1 output)
+  else
+    ls output | grep -v '[.]failed' | xargs
+    exit
+  fi
+else
+  ARCH="$1"
+  shift
 fi
 
-ARCH="$1"
-shift
-
 cd output/$ARCH && ./qemu-$ARCH.sh "$@"

From fc003ffc2824daa797c2255d97e9b6c8d6e4bd6f Mon Sep 17 00:00:00 2001
From: Mehran Baghi <1mehranbaghi@gmail.com>
Date: Thu, 2 Jan 2020 21:07:54 +0330
Subject: [PATCH 3/5] Shift the argument

---
 run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run.sh b/run.sh
index 225ed27..13f5fa2 100755
--- a/run.sh
+++ b/run.sh
@@ -7,6 +7,7 @@ then
   if [ $(ls -1 output | wc -l) -eq 1 ]
   then
     ARCH=$(ls -1 output)
+    shift
   else
     ls output | grep -v '[.]failed' | xargs
     exit

From ba7ef69e9d4e48d749bdac80ba9bb3dcf4f8e7a1 Mon Sep 17 00:00:00 2001
From: Mehran-Baghi <1mehranbaghi@gmail.com>
Date: Sat, 4 Jan 2020 18:34:32 +0330
Subject: [PATCH 4/5] Linux 5.4.7

---
 module/kernel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kernel b/module/kernel
index df47f32..057be56 100755
--- a/module/kernel
+++ b/module/kernel
@@ -1,7 +1,7 @@
 #!/bin/echo Use as an argument to mkroot.sh
 
-download 8685fffabe1ab8e6aaa2800dc0031d02273fa0a9 \
-  https://kernel.org/pub/linux/kernel/v5.x/linux-5.1.tar.gz
+download 90ce9015379f951b4da272f25302dfa0b0bc0123 \
+  https://kernel.org/pub/linux/kernel/v5.x/linux-5.4.7.tar.gz
 
 [ -z "$TARGET" ] && TARGET="${CROSS_BASE/-*/}"
 [ -z "$TARGET" ] && TARGET="$(uname -m)"

From baf9c74b4f4f683bb1d4aa00fd0ee6b732e425fd Mon Sep 17 00:00:00 2001
From: Mehran-Baghi <1mehranbaghi@gmail.com>
Date: Sun, 5 Jan 2020 23:42:29 +0330
Subject: [PATCH 5/5] Linux 5.4.8

---
 module/kernel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kernel b/module/kernel
index 057be56..8c79cbc 100755
--- a/module/kernel
+++ b/module/kernel
@@ -1,7 +1,7 @@
 #!/bin/echo Use as an argument to mkroot.sh
 
-download 90ce9015379f951b4da272f25302dfa0b0bc0123 \
-  https://kernel.org/pub/linux/kernel/v5.x/linux-5.4.7.tar.gz
+download dcd986e9e7a02500cf9c909030a4ca9e999adba2 \
+  https://kernel.org/pub/linux/kernel/v5.x/linux-5.4.8.tar.gz
 
 [ -z "$TARGET" ] && TARGET="${CROSS_BASE/-*/}"
 [ -z "$TARGET" ] && TARGET="$(uname -m)"