diff options
Diffstat (limited to 'jjb/common')
| -rw-r--r-- | jjb/common/include-apps-fetch-install-sdk.sh | 20 | ||||
| -rw-r--r-- | jjb/common/include-apps-header.sh | 4 | ||||
| -rw-r--r-- | jjb/common/include-apps-rsync-download-changeid.sh | 12 |
3 files changed, 29 insertions, 7 deletions
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh index b099d9a5..0dfbb474 100644 --- a/jjb/common/include-apps-fetch-install-sdk.sh +++ b/jjb/common/include-apps-fetch-install-sdk.sh @@ -11,8 +11,23 @@ SDKHOSTDIR="~/agl-sdk" ## apps-fetch-install-sdk.sh ################################################################################ -# should probably switch to release ... or multiple (release/snapshot) fwiw +# default to master SDKBASEURL="https://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/" + +# should probably switch to release ... or multiple (release/snapshot) fwiw +if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi + +if test x"master" = x"$AGLBRANCH" ; then + SDKBASEURL="https://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/" +fi +if test x"chinook" = x"$AGLBRANCH" ; then + SDKBASEURL="https://download.automotivelinux.org/AGL/release/chinook/latest/${TARGETSDKMACHINE}/deploy/sdk/" +fi +if test x"dab" = x"$AGLBRANCH" ; then + SDKBASEURL="https://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/" +fi + + export TARGETSDKNAME=$(curl -s "$SDKBASEURL" | grep -e "crosssdk.*\.sh<" | sed -e "s#.*<a href=\"##g" -e "s#\">poky-agl.*##g") if test x"" = x"${TARGETSDKNAME}" ; then @@ -31,7 +46,6 @@ chmod a+x ${TARGETSDKNAME} if test x"" = x"$(eval ls ${SDKHOSTDIR}/environment-setup* | grep "agl-" | grep ${TARGETSDKARCH} 2>/dev/null)" ; then bash ${TARGETSDKNAME} -d ${SDKHOSTDIR}/ -y fi -#set -x # find out the env setup script export TARGETSDKENVSCRIPT="$(eval ls ${SDKHOSTDIR}/environment-setup* | grep "agl-" | grep ${TARGETSDKARCH} 2>/dev/null)" @@ -44,6 +58,4 @@ fi echo "About to source ${TARGETSDKENVSCRIPT}" source "${TARGETSDKENVSCRIPT}" -#set | grep -i sysroots || true -#set +x diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh index eb57c926..da084eda 100644 --- a/jjb/common/include-apps-header.sh +++ b/jjb/common/include-apps-header.sh @@ -58,6 +58,9 @@ while getopts ":b:a:p:r:dvx" opt; do r) export TARGETREFSPEC="$OPTARG" ;; + t) + export AGLBRANCH="$OPTARG" + ;; v) VERBOSE=true function vprint() { @@ -79,6 +82,7 @@ while getopts ":b:a:p:r:dvx" opt; do echo " -- aarch64" echo " -p <project> - project to use (default=AGL/AGL-repo)" echo " -r <refspec> - refspec to use (default=refs/heads/master)" + echo " -t <branch> - AGL release branch to use (default=master , e.g. dab)" echo " -v - verbose" echo " -x - set -x" echo "--------------------------------------------------------------------------------" diff --git a/jjb/common/include-apps-rsync-download-changeid.sh b/jjb/common/include-apps-rsync-download-changeid.sh index 5feaeb13..8a9129a1 100644 --- a/jjb/common/include-apps-rsync-download-changeid.sh +++ b/jjb/common/include-apps-rsync-download-changeid.sh @@ -13,9 +13,15 @@ export RSYNCSRC=$(pwd)/UPLOAD/ # construct upload folder #mv UPLOAD UPLOAD2 || true -rm -rf UPLOAD/${TARGETARCH} || true -mkdir -p UPLOAD/${TARGETARCH} -export DEST=$(pwd)/UPLOAD/${TARGETARCH} +if test x"" = x"${AGLBRANCH}" ; then + rm -rf UPLOAD/${TARGETARCH} || true + mkdir -p UPLOAD/${TARGETARCH} + export DEST=$(pwd)/UPLOAD/${TARGETARCH} +else + rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true + mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH} + export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH} +fi pushd ${MYPROJECT} pwd |