From b5af19ffb7aec4a1e3c98e8e9a0775ca88dfad83 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 11 May 2024 09:03:22 +0200 Subject: [PATCH] update-helper: update qt5 branches --- manifest-tools/update-helper.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/manifest-tools/update-helper.sh b/manifest-tools/update-helper.sh index 003726f..fa58dfa 100755 --- a/manifest-tools/update-helper.sh +++ b/manifest-tools/update-helper.sh @@ -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 @@ -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