diff --git a/src/.config b/src/.config index 0d07eb2ae..577d79ad1 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 coreutils source bundles here: -# -# http://ftp.gnu.org/gnu/coreutils/ -# -COREUTILS_SOURCE_URL=http://ftp.gnu.org/gnu/coreutils/coreutils-8.28.tar.xz - # You can find the latest Dropbear source bundles here: # # http://matt.ucc.asn.au/dropbear/dropbear.html @@ -262,7 +256,7 @@ OVERLAY_TYPE=folder # The default overlay bundles are 'dhcp' and 'mll_source'. # #OVERLAY_BUNDLES=dhcp,mll_source -OVERLAY_BUNDLES=cf_tools +OVERLAY_BUNDLES=coreutils # The location where the overlay bundle software will be stored. # diff --git a/src/minimal_overlay/bundles/coreutils/.config b/src/minimal_overlay/bundles/coreutils/.config new file mode 100644 index 000000000..e40e4fc65 --- /dev/null +++ b/src/minimal_overlay/bundles/coreutils/.config @@ -0,0 +1,5 @@ +# You can find the latest coreutils source bundles here: +# +# http://ftp.gnu.org/gnu/coreutils/ +# +COREUTILS_SOURCE_URL=http://ftp.gnu.org/gnu/coreutils/coreutils-8.28.tar.xz diff --git a/src/minimal_overlay/bundles/coreutils/01_get.sh b/src/minimal_overlay/bundles/coreutils/01_get.sh index c97953b3c..7ec7d6342 100755 --- a/src/minimal_overlay/bundles/coreutils/01_get.sh +++ b/src/minimal_overlay/bundles/coreutils/01_get.sh @@ -4,15 +4,13 @@ set -e . ../../common.sh -# Grab everything after the '=' character. -DOWNLOAD_URL=$(grep -i COREUTILS_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=') +# Read the common configuration properties. +DOWNLOAD_URL=`read_property COREUTILS_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" diff --git a/src/minimal_overlay/bundles/coreutils/bundle.sh b/src/minimal_overlay/bundles/coreutils/bundle.sh index e132bc25f..cacf2e88b 100755 --- a/src/minimal_overlay/bundles/coreutils/bundle.sh +++ b/src/minimal_overlay/bundles/coreutils/bundle.sh @@ -2,8 +2,6 @@ set -e -. ../../common.sh - ./01_get.sh ./02_build.sh