interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bootstrap: Do not set up Git submodules by default 

Building OpenOCD with jimtcl and libjaylink Git submodules is deprecated
and will be removed in the upcoming releases. The remaining 'git2cl'
submodule is only required during the OpenOCD release process.

Only set up Git submodules when the 'with-submodules' argument is used,
for example during the OpenOCD release process or for the transition
period until all submodules are replaced by external dependencies.

We keep the existing 'nosubmodule' argument in order to not break
automatic testing with Jenkins.

Change-Id: Ia4fd765e3a2d6b2c40b084a1ffdf919d5f4f35bb
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/8381
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: R. Diez <rdiez-2006@rd10.de>
This commit is contained in:
Marc Schink 2024-06-26 15:50:45 +02:00 committed by Antonio Borneo
parent 77c904fd13
commit a510d51a78
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bootstrap
View File

@ -15,19 +15,21 @@ else
exit 1 exit 1
fi fi
SKIP_SUBMODULE=0 WITH_SUBMODULES=0
case "$#" in case "$#" in
0) ;; 0) ;;
1) if [ "$1" = "nosubmodule" ]; then 1) if [ "$1" = "with-submodules" ]; then
SKIP_SUBMODULE=1 WITH_SUBMODULES=1
else elif [ "$1" = "nosubmodule" ]; then
WITH_SUBMODULES=0
elif [ -n "$1" ]; then
echo "$0: Illegal argument $1" >&2 echo "$0: Illegal argument $1" >&2
echo "USAGE: $0 [nosubmodule]" >&2 echo "USAGE: $0 [with-submodules]" >&2
exit 1 exit 1
fi;; fi;;
*) echo "$0: Wrong number of command-line arguments." >&2 *) echo "$0: Wrong number of command-line arguments." >&2
echo "USAGE: $0 [nosubmodule]" >&2 echo "USAGE: $0 [with-submodules]" >&2
exit 1;; exit 1;;
esac esac
@ -42,12 +44,12 @@ autoheader --warnings=all
automake --warnings=all --gnu --add-missing --copy automake --warnings=all --gnu --add-missing --copy
) )
if [ "$SKIP_SUBMODULE" -ne 0 ]; then if [ "$WITH_SUBMODULES" -ne 0 ]; then
echo "Skipping submodule setup"
else
echo "Setting up submodules" echo "Setting up submodules"
git submodule sync git submodule sync
git submodule update --init git submodule update --init
else
echo "Skipping submodule setup"
fi fi
if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then