Merge pull request #6444 from antonlacon/jenkins-distclean

makefile_helper: only source necessary values from buildsystem's config
This commit is contained in:
Matthias Reichl 2022-05-01 20:45:17 +02:00 committed by GitHub
commit 907d2d6d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,13 +6,16 @@
set -e set -e
# If config/options can't be sourced, abort. PWD isn't the expected ROOT. # If config/options can't be sourced, abort. PWD isn't the expected ROOT.
. config/options "" # Only source from config/options what will be used
BUILD_ROOT=$(PROJECT= DEVICE= ARCH= . config/options "" && echo "${BUILD_ROOT}")
BUILD_BASE=$(PROJECT= DEVICE= ARCH= . config/options "" && echo "${BUILD_BASE}")
if [ -z "${BUILD_BASE}" -o -z "${BUILD_ROOT}" ]; then if [ -z "${BUILD_BASE}" -o -z "${BUILD_ROOT}" ]; then
# make sure variables are set before running an rm # make sure variables are set before running an rm
echo "error: ${0}: both BUILD_BASE and BUILD_ROOT must be set when running \"[clean|distclean]\"; aborting" echo "error: ${0}: both BUILD_BASE and BUILD_ROOT must be set when running \"[clean|distclean]\"; aborting"
exit 1 exit 1
fi fi
# task handling # task handling
case $1 in case $1 in
--clean) --clean)