From 590b95e96efd881aa3fd347903b458bdc01dfd99 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 1 May 2014 19:42:36 +0200 Subject: [PATCH] Add variable noDownloads to build_haiku_image. * If noDownloads is set, show an error when a download is requested. --- build/jam/ImageRules | 2 ++ build/scripts/build_haiku_image | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index a31a5f555a..6f7ad8c338 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -880,6 +880,8 @@ rule AddPackagesAndRepositoryVariablesToContainerScript script : container AddVariableToScript $(script) : resolvePackageDependencies : $(resolvePackageDependencies) ; + AddVariableToScript $(script) : noDownloads : $(HAIKU_NO_DOWNLOADS) ; + AddVariableToScript $(script) : updateAllPackages : $(HAIKU_UPDATE_ALL_PACKAGES) ; diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image index e64728160f..b13d985df0 100755 --- a/build/scripts/build_haiku_image +++ b/build/scripts/build_haiku_image @@ -16,6 +16,7 @@ set -o errexit # imageSize # imageLabel # resolvePackageDependencies +# noDownloads # updateAllPackages # updateOnly # dontClearImage @@ -214,6 +215,11 @@ downloadFile() path=$2 if [ ! -f "$path" ]; then + if [ "$noDownloads" == "1" ]; then + echo "ERROR: Would need to download $url, but HAIKU_NO_DOWNLOADS " + "is set!" + exit 1 + fi wget -O "$path" "$url" fi }