From 38235c4f852db9c707516c37876230c5e2d33825 Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Mon, 4 Dec 2017 16:22:59 +0200
Subject: [PATCH] Use local configuration (kbd).

---
 src/.config                               |  6 ------
 src/minimal_overlay/bundles/kbd/.config   |  5 +++++
 src/minimal_overlay/bundles/kbd/01_get.sh | 10 ++++------
 3 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 src/minimal_overlay/bundles/kbd/.config

diff --git a/src/.config b/src/.config
index d86a2afd7..5519eec09 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 kbd source bundles here:
-#
-#   http://www.kbd-project.org/
-#
-KBD_SOURCE_URL=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.gz
-
 # You can find the latest kexec-tools source bundles here:
 #
 #   https://www.kernel.org/pub/linux/utils/kernel/kexec/
diff --git a/src/minimal_overlay/bundles/kbd/.config b/src/minimal_overlay/bundles/kbd/.config
new file mode 100644
index 000000000..17229badc
--- /dev/null
+++ b/src/minimal_overlay/bundles/kbd/.config
@@ -0,0 +1,5 @@
+# You can find the latest kbd source bundles here:
+#
+#   http://www.kbd-project.org/
+#
+KBD_SOURCE_URL=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.gz
diff --git a/src/minimal_overlay/bundles/kbd/01_get.sh b/src/minimal_overlay/bundles/kbd/01_get.sh
index 1e3f57438..e3fcff033 100755
--- a/src/minimal_overlay/bundles/kbd/01_get.sh
+++ b/src/minimal_overlay/bundles/kbd/01_get.sh
@@ -4,15 +4,13 @@ set -e
 
 . ../../common.sh
 
-# Grab everything after the '=' character.
-DOWNLOAD_URL=$(grep -i KBD_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
+# Read the common configuration properties.
+DOWNLOAD_URL=`read_property KBD_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
   echo "Source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE is missing and will be downloaded."
   USE_LOCAL_SOURCE="false"
@@ -61,6 +59,6 @@ mv data/keymaps/i386/fgGIod/trf.map \
 mv data/keymaps/i386/colemak/en-latin9.map \
   data/keymaps/i386/colemak/colemak.map
 
-# Rename keymaps with the same name BEGIN
+# Rename keymaps with the same name END
 
 cd $SRC_DIR