From 8ba922c5ec00c2603cb8e417c4837629ebaf3541 Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Sat, 2 Dec 2017 03:15:18 +0200
Subject: [PATCH] Overlay enhancement - 'bundle_deps' can contain comments.
 Minor updates on the software versions in '.config'.

---
 src/.config                          | 8 ++++----
 src/minimal_overlay/overlay_build.sh | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/.config b/src/.config
index cb5e3b742..3645f3354 100644
--- a/src/.config
+++ b/src/.config
@@ -63,7 +63,7 @@ DROPBEAR_SOURCE_URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.ta
 #
 #   http://felix.apache.org
 #
-FELIX_SOURCE_URL=http://archive.apache.org/dist/felix/org.apache.felix.main.distribution-5.6.8.tar.gz
+FELIX_SOURCE_URL=http://archive.apache.org/dist/felix/org.apache.felix.main.distribution-5.6.10.tar.gz
 
 # You can find the latest fio source bundles here:
 #
@@ -131,7 +131,7 @@ NCURSES_SOURCE_URL=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz
 #
 #   http://jdk.java.net/9
 #
-OPENJDK_URL=http://download.java.net/java/GA/jdk9/9/binaries/jdk-9+181_linux-x64_bin.tar.gz
+OPENJDK_URL=http://download.java.net/java/GA/jdk9/9.0.1/binaries/openjdk-9.0.1_linux-x64_bin.tar.gz
 
 # You can find the latest static-get shell script here:
 #
@@ -230,7 +230,7 @@ OVERLAY_TYPE=folder
 # Currently available overlay software:
 #
 # glibc_full  - all core GNU C libraries (useful if other software is included).
-# cf_cli      - CLoud Foundry CLI (command line interface).
+# cf_cli      - Cloud Foundry CLI (command line interface).
 # coreutils   - set of commonly used GNU executable utilities.
 # dhcp        - DHCP and DNS functionality.
 # dialog      - shell scripting for ncurses
@@ -239,7 +239,7 @@ OVERLAY_TYPE=folder
 # fio         - I/O load generator.
 # java        - installs Oracle's JRE or JDK. Manual preparations are required.
 # kbd         - keyboard utilities
-# kexec-tools - execute another kernel from userspace
+# kexec_tools - execute another kernel from userspace
 # libevent    - event notification library.
 # links       - text browser for the web.
 # lua         - scripting language.
diff --git a/src/minimal_overlay/overlay_build.sh b/src/minimal_overlay/overlay_build.sh
index 30d8e878b..430e3c7f7 100755
--- a/src/minimal_overlay/overlay_build.sh
+++ b/src/minimal_overlay/overlay_build.sh
@@ -50,6 +50,13 @@ do
       # Trim all white spaces in bundle name
       BUNDLE_DEP=`echo $line | awk '{print $1}'`
 
+      case "$BUNDLE_DEP" in
+      \#*)
+        # This is comment line.
+        continue
+        ;;
+      esac
+
       if [ "$BUNDLE_DEP" = "" ] ; then
         continue
       elif [ -d $MAIN_SRC_DIR/work/overlay/$BUNDLE_DEP ] ; then