From dde49befe732ded4f5ed62c1ffd469e38f31dfd9 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 25 Aug 2015 10:55:32 -0300 Subject: [PATCH] Remove ensure_source_directories_present() and call update_freebsd_sources() direct --- build.sh | 4 ++-- tools/builder_common.sh | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 00a92ad8cf..1fb01f811c 100755 --- a/build.sh +++ b/build.sh @@ -236,7 +236,7 @@ case $BUILDACTION in # It will be handled below ;; updatesources) - ensure_source_directories_present + update_freebsd_sources ;; enablememorydisk) prestage_on_ram_setup @@ -301,7 +301,7 @@ if [ -z "${_SKIP_REBUILD_PRESTAGE}" ]; then clean_builder # Make sure source directories are present. - ensure_source_directories_present + update_freebsd_sources git_last_commit # Ensure binaries are present that builder system requires diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 8624334e14..fe431cd8d0 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1060,12 +1060,6 @@ clean_builder() { echo ">>> Cleaning of builder environment has finished." } -# This routine ensures that the $FREEBSD_SRC_DIR has sources -# and is ready for action / building. -ensure_source_directories_present() { - update_freebsd_sources -} - clone_directory_contents() { if [ ! -d "$1" -o ! -d "$2" ]; then if [ -z "${LOGFILE}" ]; then