From 6c9beb690c1939843a53c871bd66b226f5c15b10 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 25 Jan 2016 07:45:36 +0100 Subject: [PATCH] build: skip check if forced by optional arguments --- build/common.sh | 3 ++- build/core.sh | 2 +- build/plugins.sh | 2 +- build/ports.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/common.sh b/build/common.sh index e515efe..7d426c0 100644 --- a/build/common.sh +++ b/build/common.sh @@ -302,8 +302,9 @@ check_packages() { PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_FLAVOUR}-${ARCH}.tar") MARKER=${1} + SKIP=${2} - if [ -z "${MARKER}" -o -z "${PACKAGESET}" ]; then + if [ -z "${MARKER}" -o -z "${PACKAGESET}" -o -n "${SKIP}" ]; then return fi diff --git a/build/core.sh b/build/core.sh index f5d6289..39598b5 100644 --- a/build/core.sh +++ b/build/core.sh @@ -31,7 +31,7 @@ set -e CORE_MARKER="core" -check_packages ${CORE_MARKER} +check_packages ${CORE_MARKER} ${@} setup_stage ${STAGEDIR} setup_base ${STAGEDIR} diff --git a/build/plugins.sh b/build/plugins.sh index 6e17101..3cfa505 100644 --- a/build/plugins.sh +++ b/build/plugins.sh @@ -32,7 +32,7 @@ set -e PLUGINS_LIST=$(make -C ${PLUGINSDIR} list) PLUGINS_MARKER="plugins" -check_packages ${PLUGINS_MARKER} +check_packages ${PLUGINS_MARKER} ${@} setup_stage ${STAGEDIR} setup_base ${STAGEDIR} diff --git a/build/ports.sh b/build/ports.sh index 3668158..c3eac12 100644 --- a/build/ports.sh +++ b/build/ports.sh @@ -32,7 +32,7 @@ set -e PORTS_LIST=$(cat ${CONFIGDIR}/ports.conf) PORTS_MARKER="ports" -check_packages ${PORTS_MARKER} +check_packages ${PORTS_MARKER} ${@} setup_stage ${STAGEDIR} setup_base ${STAGEDIR}