From b40bb4f4d1668778c1469bae4750b04d70f223c8 Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Sun, 3 Dec 2017 00:59:37 +0200
Subject: [PATCH] Use local configuration (dropbear).

---
 src/.config                                    |  8 +-------
 src/minimal_overlay/bundles/dropbear/.config   |  5 +++++
 src/minimal_overlay/bundles/dropbear/01_get.sh | 10 ++++------
 src/minimal_overlay/bundles/dropbear/bundle.sh |  2 --
 4 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 src/minimal_overlay/bundles/dropbear/.config

diff --git a/src/.config b/src/.config
index 577d79ad1..14c032e07 100644
--- a/src/.config
+++ b/src/.config
@@ -41,12 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0
 #                                                                   #
 #####################################################################
 
-# You can find the latest Dropbear source bundles here:
-#
-#   http://matt.ucc.asn.au/dropbear/dropbear.html
-#
-DROPBEAR_SOURCE_URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2
-
 # You can find the latest Apache Felix source bundles here:
 #
 #   http://felix.apache.org
@@ -256,7 +250,7 @@ OVERLAY_TYPE=folder
 # The default overlay bundles are 'dhcp' and 'mll_source'.
 #
 #OVERLAY_BUNDLES=dhcp,mll_source
-OVERLAY_BUNDLES=coreutils
+OVERLAY_BUNDLES=dropbear
 
 # The location where the overlay bundle software will be stored.
 #
diff --git a/src/minimal_overlay/bundles/dropbear/.config b/src/minimal_overlay/bundles/dropbear/.config
new file mode 100644
index 000000000..6ec3e9918
--- /dev/null
+++ b/src/minimal_overlay/bundles/dropbear/.config
@@ -0,0 +1,5 @@
+# You can find the latest Dropbear source bundles here:
+#
+#   http://matt.ucc.asn.au/dropbear/dropbear.html
+#
+DROPBEAR_SOURCE_URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2
diff --git a/src/minimal_overlay/bundles/dropbear/01_get.sh b/src/minimal_overlay/bundles/dropbear/01_get.sh
index 6f4c9dd04..450369b5b 100755
--- a/src/minimal_overlay/bundles/dropbear/01_get.sh
+++ b/src/minimal_overlay/bundles/dropbear/01_get.sh
@@ -4,16 +4,14 @@ set -e
 
 . ../../common.sh
 
-# Grab everything after the '=' character.
-DOWNLOAD_URL=$(grep -i DROPBEAR_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
+# Read the common configuration properties.
+DOWNLOAD_URL=`read_property DROPBEAR_SOURCE_URL`
+USE_LOCAL_SOURCE=`read_property USE_LOCAL_SOURCE`
 
 # Grab everything after the last '/' character.
 ARCHIVE_FILE=${DOWNLOAD_URL##*/}
 
-# Read the 'USE_LOCAL_SOURCE' property from '.config'
-USE_LOCAL_SOURCE="$(grep -i USE_LOCAL_SOURCE $MAIN_SRC_DIR/.config | cut -f2 -d'=')"
-
-if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE  ] ; then
+if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE ] ; then
   echo "Source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE is missing and will be downloaded."
   USE_LOCAL_SOURCE="false"
 fi
diff --git a/src/minimal_overlay/bundles/dropbear/bundle.sh b/src/minimal_overlay/bundles/dropbear/bundle.sh
index e132bc25f..cacf2e88b 100755
--- a/src/minimal_overlay/bundles/dropbear/bundle.sh
+++ b/src/minimal_overlay/bundles/dropbear/bundle.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-. ../../common.sh
-
 ./01_get.sh
 ./02_build.sh