From a85b17d115a9ed640d7506002a74e3d75683a4aa Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 13 Jan 2019 22:07:41 +0200
Subject: [PATCH 1/2] build.sh: OS_ vars are now uppercase

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index ab9791ee18..d1d3a4866a 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ board=$1
 target=${*:2}
 cd $(dirname $0)
 basedir=$(pwd)
-gzip=$(which pigz || which gzip)
+gzip=$(which pigz 2> /dev/null || which gzip 2> /dev/null)
 
 # extra environment from local file
 test -f $basedir/.build-env && source $basedir/.build-env
@@ -26,14 +26,14 @@ test -f $basedir/.build-env && source $basedir/.build-env
 if [ -n "$THINGOS_SHORT_NAME" ]; then
     osname=$THINGOS_SHORT_NAME
 else
-    osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name)
+    osname=$(source $basedir/board/common/overlay/etc/version && echo $OS_SHORT_NAME)
 fi
 
 # OS version
 if [ -n "$THINGOS_VERSION" ]; then
     osversion=$THINGOS_VERSION
 else
-    osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version)
+    osversion=$(source $basedir/board/common/overlay/etc/version && echo $OS_VERSION)
 fi
 
 # when the special "boards" keyword is used for board, simply list all known boards

From c29cf150d9dc3fa3535de963e2f3369a7f0e4d94 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 13 Jan 2019 22:23:48 +0200
Subject: [PATCH 2/2] /etc/init.d/os_conf: prepend _ to some global vars

---
 board/common/overlay/etc/init.d/os_conf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/board/common/overlay/etc/init.d/os_conf b/board/common/overlay/etc/init.d/os_conf
index ca0d6fa2ad..e2f6f6fd58 100644
--- a/board/common/overlay/etc/init.d/os_conf
+++ b/board/common/overlay/etc/init.d/os_conf
@@ -1,21 +1,21 @@
 
-SYS_CONF="/etc/os.conf"
-BOOT_CONF="/boot/os.conf"
-DATA_CONF="/data/etc/os.conf"
+_SYS_CONF="/etc/os.conf"
+_BOOT_CONF="/boot/os.conf"
+_DATA_CONF="/data/etc/os.conf"
 
 
 # source in all conf files in order of precedence
-if [[ -f ${SYS_CONF} ]]; then
-    source ${SYS_CONF}
+if [[ -f ${_SYS_CONF} ]]; then
+    source ${_SYS_CONF}
 fi
 
-if [[ -f ${DATA_CONF} ]]; then
-    source ${DATA_CONF}
+if [[ -f ${_DATA_CONF} ]]; then
+    source ${_DATA_CONF}
 fi
 
-if [[ -f ${BOOT_CONF} ]]; then
-    source ${BOOT_CONF}
+if [[ -f ${_BOOT_CONF} ]]; then
+    source ${_BOOT_CONF}
 fi
 
-unset SYS_CONF BOOT_CONF DATA_CONF
+unset _SYS_CONF _BOOT_CONF _DATA_CONF