From c69556dc7ea2fb94e1fada2b29687a09f1e72256 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 21 Oct 2025 13:32:26 +0200 Subject: [PATCH] composite: shield all "make print" use here --- composite/custom.sh | 2 +- composite/distribution.sh | 2 +- composite/factory.sh | 2 +- composite/hotfix.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composite/custom.sh b/composite/custom.sh index 77c0d14..c25696d 100644 --- a/composite/custom.sh +++ b/composite/custom.sh @@ -29,7 +29,7 @@ IMAGE=${1} set -e -eval "$(make print-PLUGINSDIR,PLUGINSENV)" +eval "$(make print-PLUGINSDIR,PLUGINSENV 2> /dev/null)" # handle path-based plugins as custom install for target image MISSING= diff --git a/composite/distribution.sh b/composite/distribution.sh index f45a49d..1900ed2 100644 --- a/composite/distribution.sh +++ b/composite/distribution.sh @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,SETSDIR)" +eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,SETSDIR 2> /dev/null)" PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_ARCH}.tar") diff --git a/composite/factory.sh b/composite/factory.sh index 82f9bec..a52403f 100644 --- a/composite/factory.sh +++ b/composite/factory.sh @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,PRODUCT_ZFS,SETSDIR)" +eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,PRODUCT_ZFS,SETSDIR 2> /dev/null)" PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_ARCH}.tar") diff --git a/composite/hotfix.sh b/composite/hotfix.sh index fe7bbae..1010e88 100644 --- a/composite/hotfix.sh +++ b/composite/hotfix.sh @@ -48,7 +48,7 @@ run_stage() fi } -eval "$(make print-PRODUCT_CORES,PRODUCT_PLUGINS,STAGEDIR)" +eval "$(make print-PRODUCT_CORES,PRODUCT_PLUGINS,STAGEDIR 2> /dev/null)" if [ -z "${TARGET}" ]; then # run everything except ports in hotfix mode