The docs build uses some cached tarballs, use the standarised location for these.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- scripts/run-docs-build | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 718467f..96ab992 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -7,7 +7,7 @@ # $3 as the path to bitbake # # Environment variables: -# - docs_buildtools as the path to buildtools script for the docs. +# - buildtools_url as the path to buildtools script for the docs. # Can be found here: https://autobuilder.yocto.io/pub/buildtools/ # - docbookarchive as the path to old (pre 3.1.5 and Sphinx migration) docs tarball # Can be found here: https://downloads.yoctoproject.org/mirror/docbook-mirror/docbook-archives-20201105.tar.xz @@ -21,20 +21,33 @@ set -x builddir=$(realpath "$1") ypdocs=$(realpath "$2/documentation/") bbdocs=$(realpath "$3/doc/") -docs_buildtools=${docs_buildtools:-/srv/autobuilder/autobuilder.yocto.io/pub/buildtools/x86_64-buildtools-docs-nativesdk-standalone-4.1.2.sh} outputdir=$builddir/output scriptdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" PUBLISH=${PUBLISH:-1} +sharedir=`jq '.["BASE_SHAREDDIR"]' < $HOME/config-local.json` +buildtools_url=${buildtools_url:-https://downloads.yoctoproject.org/releases/yocto/yocto-4.1.2/buildtools/x86_64-buildtools-docs-nativesdk-standalone-4.1.2.sh} +docbookarchive_url=${docbookarchive:-https://downloads.yoctoproject.org/mirror/docbook-mirror/docbook-archives-20201105.tar.xz} +buildtools_name=`basename $buildtools_url` +buildtools_localpath=${sharedir}/cluster-downloads-cache/${buildtools_name} + +if [ ! -e ${buildtools_localpath} ]; then + mkdir -p `dirname ${buildtools_localpath}` + wget ${buildtools_url} -O ${buildtools_localpath} +fi cd $builddir mkdir buildtools -$docs_buildtools -y -d $builddir/buildtools +${buildtools_localpath} -y -d $builddir/buildtools . $builddir/buildtools/environment-setup* # Getting the old docbook built docs from an archive. Not rebuilding them. -#wget https://downloads.yoctoproject.org/mirror/docbook-mirror/docbook-archives-20201105.tar.xz -docbookarchive=${docbookarchive:-/srv/autobuilder/autobuilder.yocto.io/pub/docbook-mirror/docbook-archives-20201105.tar.xz} +docbookarchive_localpath=${sharedir}/cluster-downloads-cache/`basename ${docbookarchive}` +if [ ! -e ${docbookarchive_localpath} ]; then + mkdir -p `dirname ${docbookarchive_localpath}` + wget ${buildtools_url} -O ${docbookarchive_localpath} +fi + mkdir $outputdir cd $outputdir echo Extracing old content from archive
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#63990): https://lists.yoctoproject.org/g/yocto/message/63990 Mute This Topic: https://lists.yoctoproject.org/mt/108917149/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
