Skip to content

Commit

Permalink
update-helper: update qt5 branches
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesfernandez committed May 11, 2024
1 parent 73b0c72 commit 019a205
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions manifest-tools/update-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,7 @@ fi

# meta-qt5
SPECIAL_METAQT5_BRANCH=${BRANCH}
if [ "${BRANCH}" == "nanbield" ]
then
SPECIAL_METAQT5_BRANCH="master"
fi
if [ "${BRANCH}" == "scarthgap" ]
then
SPECIAL_METAQT5_BRANCH="master"
fi

if [ -d "meta-qt5" ]
then
cd meta-qt5 || exit
Expand Down Expand Up @@ -681,7 +674,7 @@ if grep -q "${COMMIT_META_QT5}" "${BASEDIR}/../default.xml"
then
echo -e "meta-qt5 last commit: ${COMMIT_META_QT5}"
else
echo -e "meta-qt5 last commit: ${COLOR_WARNING}${COMMIT_META_QT5}${COLOR_RESET} Check ${REPO_META_QT5}/tree/${SPECIAL_QT5_BRANCH}"
echo -e "meta-qt5 last commit: ${COLOR_WARNING}${COMMIT_META_QT5}${COLOR_RESET} Check ${REPO_META_QT5}/tree/${SPECIAL_METAQT5_BRANCH}"
fi

# Display latest commit for meta-qt5-extra
Expand Down

0 comments on commit 019a205

Please sign in to comment.