diff --git a/src/.config b/src/.config index 430187db1..301bf0397 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 ncurses archives here: -# -# https://ftp.gnu.org/pub/gnu/ncurses/ -# -NCURSES_SOURCE_URL=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz - # You can find the latest Open JDK archives here: # # http://jdk.java.net/9 diff --git a/src/minimal_overlay/bundles/ncurses/bundle_deps b/src/minimal_overlay/bundles/ncurses/.config similarity index 55% rename from src/minimal_overlay/bundles/ncurses/bundle_deps rename to src/minimal_overlay/bundles/ncurses/.config index c90ba833f..4f5c94fe1 100644 --- a/src/minimal_overlay/bundles/ncurses/bundle_deps +++ b/src/minimal_overlay/bundles/ncurses/.config @@ -4,4 +4,10 @@ # bundle 'ncurses'. On Ubuntu you can add the headers with # the following command: # -# sudo apt install libncurses5-dev +# sudo apt install libncurses-dev +# +# You can find the latest ncurses archives here: +# +# https://ftp.gnu.org/pub/gnu/ncurses/ +# +NCURSES_SOURCE_URL=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz diff --git a/src/minimal_overlay/bundles/ncurses/01_get.sh b/src/minimal_overlay/bundles/ncurses/01_get.sh index d8f16a657..0a29bcab5 100755 --- a/src/minimal_overlay/bundles/ncurses/01_get.sh +++ b/src/minimal_overlay/bundles/ncurses/01_get.sh @@ -4,15 +4,13 @@ set -e . ../../common.sh -# Grab everything after the '=' character. -DOWNLOAD_URL=$(grep -i NCURSES_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=') +# Read the common configuration properties. +DOWNLOAD_URL=`read_property NCURSES_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"