From f61b87ae78ff376c206baad10bc4184328889db7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 6 Sep 2021 09:49:41 +0300 Subject: [PATCH] Move all Qt module SRCREVs into one file Move all the module SRCREV into qt6-git.inc file using the same format, where repository name is used for the postfix. Changes to the module SRCREVs are mostly done by updating all the modules at once, usually either with a separate update script, srcrev_update bbclass or by external update bot. This change should make the update process more easily automated. Update the srcrev_update bbclass to handle updates in qt6-git.inc in addition to recipe files, with and without the repository name postfix. Pick-to: 6.2 Change-Id: I711e7867dba3b066d363ca40f78e7b4aa740a69c Reviewed-by: Mikko Gronoff --- classes/srcrev-update.bbclass | 26 ++++-------- recipes-qt/qt6/qt3d_git.bb | 6 +-- recipes-qt/qt6/qt5compat_git.bb | 1 - recipes-qt/qt6/qt6-git.inc | 40 +++++++++++++++++++ recipes-qt/qt6/qtbase_git.bb | 1 - recipes-qt/qt6/qtcharts_git.bb | 1 - recipes-qt/qt6/qtcoap_git.bb | 1 - recipes-qt/qt6/qtconnectivity_git.bb | 1 - recipes-qt/qt6/qtdatavis3d_git.bb | 1 - recipes-qt/qt6/qtdeclarative_git.bb | 1 - recipes-qt/qt6/qtdeviceutilities_git.bb | 1 - recipes-qt/qt6/qtimageformats_git.bb | 1 - recipes-qt/qt6/qtlottie_git.bb | 1 - recipes-qt/qt6/qtmqtt_git.bb | 1 - recipes-qt/qt6/qtmultimedia_git.bb | 1 - recipes-qt/qt6/qtnetworkauth_git.bb | 1 - recipes-qt/qt6/qtopcua_git.bb | 1 - recipes-qt/qt6/qtpositioning_git.bb | 1 - recipes-qt/qt6/qtquick3d_git.bb | 6 +-- .../qt6/qtquickdesigner-components_git.bb | 1 - recipes-qt/qt6/qtquicktimeline_git.bb | 1 - recipes-qt/qt6/qtremoteobjects_git.bb | 1 - recipes-qt/qt6/qtscxml_git.bb | 1 - recipes-qt/qt6/qtsensors_git.bb | 1 - recipes-qt/qt6/qtserialbus_git.bb | 1 - recipes-qt/qt6/qtserialport_git.bb | 1 - recipes-qt/qt6/qtshadertools_git.bb | 1 - recipes-qt/qt6/qtspeech_git.bb | 1 - recipes-qt/qt6/qtsvg_git.bb | 1 - recipes-qt/qt6/qttools_git.bb | 10 ++--- recipes-qt/qt6/qttranslations_git.bb | 1 - recipes-qt/qt6/qtvirtualkeyboard_git.bb | 1 - recipes-qt/qt6/qtwayland_git.bb | 1 - recipes-qt/qt6/qtwebchannel_git.bb | 1 - recipes-qt/qt6/qtwebsockets_git.bb | 1 - 35 files changed, 55 insertions(+), 63 deletions(-) diff --git a/classes/srcrev-update.bbclass b/classes/srcrev-update.bbclass index 7179860..880af30 100644 --- a/classes/srcrev-update.bbclass +++ b/classes/srcrev-update.bbclass @@ -1,7 +1,10 @@ python do_srcrev_update() { import subprocess - recipe = d.getVar("FILE") + recipe = d.getVar('FILE') + srcrev_file = os.path.join(os.path.dirname(recipe), 'qt6-git.inc') + + module = d.getVar('QT_MODULE') scms = [] fetcher = bb.fetch2.Fetch(d.getVar('SRC_URI').split(), d) @@ -13,32 +16,19 @@ python do_srcrev_update() { if len(scms) == 0: return - if len(scms) == 1 and len(urldata[scms[0]].names) == 1: - ud = urldata[scms[0]] - rev = ud.method.latest_revision(ud, d, ud.names[0]) - srcrev = d.getVar("SRCREV") - - if srcrev == rev: - bb.plain("%s SRCREV: %s is already latest" % (recipe, srcrev)) - return - - bb.plain("%s SRCREV: %s -> %s" % (recipe, srcrev, rev)) - cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev) - bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None) - return - for scm in scms: ud = urldata[scm] for name in ud.names: rev = ud.method.latest_revision(ud, d, name) srcrev = d.getVar("SRCREV_%s" % name) + if srcrev is None: srcrev = d.getVar("SRCREV") if srcrev == rev: - bb.plain("%s SRCREV_%s: %s is already latest" % (recipe, name, srcrev)) + bb.plain("%s: %s is already latest" % (name, srcrev)) continue - bb.plain("%s SRCREV_%s: %s -> %s" % (recipe, name, srcrev, rev)) - cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev) + bb.plain("%s: %s -> %s" % (name, srcrev, rev)) + cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" % (recipe, srcrev_file, name, srcrev, rev) bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None) } do_srcrev_update[nostamp] = "1" diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index 326c624..ff0878d 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -17,7 +17,7 @@ include recipes-qt/qt6/qt6.inc ASSIMP_BRANCH = "qt6_assimp" SRC_URI += " \ - ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ " DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native" @@ -25,6 +25,4 @@ DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native" PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp" PACKAGECONFIG[qtgamepad] = ",,qtgamepad" -SRCREV_FORMAT = "qt3d_assimp" -SRCREV_qt3d = "8791c229971799c1a44d33f52b49927bea110831" -SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" +SRCREV_FORMAT = "qt3d_qt3d-assimp" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index c4f1144..3c393b5 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -21,4 +21,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative" BBCLASSEXTEND = "native nativesdk" -SRCREV = "7b441517eae58a937de1644bc2165d37d8da4d22" diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index f866b55..0c42878 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -12,3 +12,43 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" PV = "6.3.0" + +SRCREV = "${SRCREV_${QT_MODULE}}" + +SRCREV_qt3d = "8791c229971799c1a44d33f52b49927bea110831" +SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" +SRCREV_qt5compat = "7b441517eae58a937de1644bc2165d37d8da4d22" +SRCREV_qtbase = "3c625b77529f1e5348e568b25852a6e5f1f159b0" +SRCREV_qtcharts = "4e7f821e8954f025cde47fbc866acc28493d764d" +SRCREV_qtcoap = "f5618569c8a4d50ec3439efcb420b562a8b1c5f1" +SRCREV_qtconnectivity = "6b6280885aea1b7ceb665fc2fad995ed25045d33" +SRCREV_qtdatavis3d = "61b154fd57b5dff60077d9e9cca38586b7874107" +SRCREV_qtdeclarative = "c8335abf42174463f9def15393a42c35ffb5fe39" +SRCREV_qtdeviceutilities = "baf90c5dd2599cc1928bbf18eb878564655c975b" +SRCREV_qtimageformats = "ca47d4206c9a40c6c8143656c03fd2e749643469" +SRCREV_qtlottie = "0bcbb7fb293a1c989774493957e568868dbc6747" +SRCREV_qtmqtt = "dfeef617535172d05cbf1cbfc933d0de0c4c12a5" +SRCREV_qtmultimedia = "6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7" +SRCREV_qtnetworkauth = "7c3ec52f70d3244c42a067e7f77b3652b6d3fe03" +SRCREV_qtopcua = "6accaffc378ec9773aac862ebc59a6b57a8c8609" +SRCREV_qtlocation = "6f4ebbe2963a24659d24317e3ae936c4f5ffd15e" +SRCREV_qtquick3d = "b76d7b1e622b143c427681020c49e12aa1a04c05" +SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" +SRCREV_qtquickdesigner-components = "decdf79401763670419c45cd33e38390d46d8db4" +SRCREV_qtquicktimeline = "bf82f2e445edf7a4c95f60919ad53a8ff306812f" +SRCREV_qtremoteobjects = "6767c7915493498bcd15ba196050fb07169d4100" +SRCREV_qtscxml = "0f685c628a4eaebd4274f4dee97d3f7b209f3027" +SRCREV_qtsensors = "17be066692971ff51e3224d48809cf0946bc581c" +SRCREV_qtserialbus = "09994f480917f9c5aa6b21a6999d53e402c406dd" +SRCREV_qtserialport = "2d3d5112667105b4748418653ff737577e11267c" +SRCREV_qtshadertools = "471099de67b868e9cdc418178ae9c542211fefe5" +SRCREV_qtspeech = "462c3384467cec55a31fde11afb959321063a0ce" +SRCREV_qtsvg = "09abc1ad49e55e7b3fb8cd3587075428a0bffa06" +SRCREV_qttools = "14e0af4e3ca03f13f8ae2f9c62e6dd62d277ea4b" +SRCREV_qttools-qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4" +SRCREV_qttools-litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83" +SRCREV_qttranslations = "dbcf76dc2f7173906eee6c6f83630a90ab80b4a4" +SRCREV_qtvirtualkeyboard = "04be79feea84aa668a9f72ae41beafca7e9fd0a4" +SRCREV_qtwayland = "cfd65d318546162c1f8fad48b43da8ab62d24369" +SRCREV_qtwebchannel = "e24d35a88d8f86cd0af450de801f9b9654db950a" +SRCREV_qtwebsockets = "f4a6e71c448a8d058658c3e9e52adee5d0b947bf" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index dff707d..719ba9e 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -160,4 +160,3 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ BBCLASSEXTEND = "native nativesdk" -SRCREV = "3c625b77529f1e5348e568b25852a6e5f1f159b0" diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 7796b21..be915a1 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -13,4 +13,3 @@ DEPENDS += "qtbase" PACKAGECONFIG ?= "qml" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "4e7f821e8954f025cde47fbc866acc28493d764d" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 47ba679..4a45fed 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -12,4 +12,3 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative" -SRCREV = "f5618569c8a4d50ec3439efcb420b562a8b1c5f1" diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index be4c147..fdccb83 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -20,4 +20,3 @@ DEPENDS += "qtbase qtdeclarative" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5" -SRCREV = "6b6280885aea1b7ceb665fc2fad995ed25045d33" diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb index 434e5d5..2ea621c 100644 --- a/recipes-qt/qt6/qtdatavis3d_git.bb +++ b/recipes-qt/qt6/qtdatavis3d_git.bb @@ -10,4 +10,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "61b154fd57b5dff60077d9e9cca38586b7874107" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 5d7f0ae..5c443ff 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -18,4 +18,3 @@ DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "c8335abf42174463f9def15393a42c35ffb5fe39" diff --git a/recipes-qt/qt6/qtdeviceutilities_git.bb b/recipes-qt/qt6/qtdeviceutilities_git.bb index 8d60264..4d1e484 100644 --- a/recipes-qt/qt6/qtdeviceutilities_git.bb +++ b/recipes-qt/qt6/qtdeviceutilities_git.bb @@ -8,4 +8,3 @@ include recipes-qt/qt6/qt6-git.inc DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard" RDEPENDS:${PN} = "connman" -SRCREV = "baf90c5dd2599cc1928bbf18eb878564655c975b" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index 69e5f9f..0f7618f 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -24,4 +24,3 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng" PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff" PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp" -SRCREV = "ca47d4206c9a40c6c8143656c03fd2e749643469" diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index 06e25c9..dc81cf3 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "0bcbb7fb293a1c989774493957e568868dbc6747" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index e1ddc2a..67f1f69 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -13,4 +13,3 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" -SRCREV = "dfeef617535172d05cbf1cbfc933d0de0c4c12a5" diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb index fdec0a3..631bdd4 100644 --- a/recipes-qt/qt6/qtmultimedia_git.bb +++ b/recipes-qt/qt6/qtmultimedia_git.bb @@ -22,4 +22,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative" EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF" -SRCREV = "6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index c6cfb6e..65a59a2 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "7c3ec52f70d3244c42a067e7f77b3652b6d3fe03" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index afdc264..71143e3 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -20,4 +20,3 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "6accaffc378ec9773aac862ebc59a6b57a8c8609" diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb index 1ffefd2..05de940 100644 --- a/recipes-qt/qt6/qtpositioning_git.bb +++ b/recipes-qt/qt6/qtpositioning_git.bb @@ -23,4 +23,3 @@ PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy" PACKAGECONFIG[nmea] = ",,qtserialport" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "6f4ebbe2963a24659d24317e3ae936c4f5ffd15e" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index feea66a..bf12adb 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -12,7 +12,7 @@ include recipes-qt/qt6/qt6.inc ASSIMP_BRANCH = "qt6_assimp" SRC_URI += " \ - ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ " DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native" @@ -25,6 +25,4 @@ FILES:${PN}-qmlplugins += " \ ${QT6_INSTALL_QMLDIR}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "b76d7b1e622b143c427681020c49e12aa1a04c05" -SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" +SRCREV_FORMAT = "qtquick3d_qtquick3d-assimp" diff --git a/recipes-qt/qt6/qtquickdesigner-components_git.bb b/recipes-qt/qt6/qtquickdesigner-components_git.bb index faafbb2..e56ce81 100644 --- a/recipes-qt/qt6/qtquickdesigner-components_git.bb +++ b/recipes-qt/qt6/qtquickdesigner-components_git.bb @@ -13,4 +13,3 @@ QT_MODULE_BRANCH = "dev" DEPENDS += "qtbase qtdeclarative" -SRCREV = "decdf79401763670419c45cd33e38390d46d8db4" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index 4bea83a..e14cff2 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "bf82f2e445edf7a4c95f60919ad53a8ff306812f" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index f128e11..9a80a0b 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -13,6 +13,5 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" -SRCREV = "6767c7915493498bcd15ba196050fb07169d4100" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index 1dfb729..d8c67e5 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -17,4 +17,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "0f685c628a4eaebd4274f4dee97d3f7b209f3027" diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb index 60e57bf..9d59cd8 100644 --- a/recipes-qt/qt6/qtsensors_git.bb +++ b/recipes-qt/qt6/qtsensors_git.bb @@ -14,4 +14,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "17be066692971ff51e3224d48809cf0946bc581c" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 58f790b..04640fd 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/recipes-qt/qt6/qtserialbus_git.bb @@ -15,4 +15,3 @@ DEPENDS += "qtbase qtserialport qtserialbus-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "09994f480917f9c5aa6b21a6999d53e402c406dd" diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index 100b0d5..1fe3356 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -16,4 +16,3 @@ DEPENDS += "qtbase" BBCLASSEXTEND = "native nativesdk" -SRCREV = "2d3d5112667105b4748418653ff737577e11267c" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index e78ad84..6b4bc6c 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -12,4 +12,3 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "471099de67b868e9cdc418178ae9c542211fefe5" diff --git a/recipes-qt/qt6/qtspeech_git.bb b/recipes-qt/qt6/qtspeech_git.bb index d5a6f9c..4f88d57 100644 --- a/recipes-qt/qt6/qtspeech_git.bb +++ b/recipes-qt/qt6/qtspeech_git.bb @@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "462c3384467cec55a31fde11afb959321063a0ce" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index 88dfe15..59da586 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "09abc1ad49e55e7b3fb8cd3587075428a0bffa06" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 8dda16b..c095c49 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -13,8 +13,8 @@ include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc SRC_URI += " \ - ${QT_GIT}/playground/qlitehtml.git;name=qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \ - git://github.com/litehtml/litehtml.git;name=litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \ + ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \ + git://github.com/litehtml/litehtml.git;name=qttools-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \ " DEPENDS += "qtbase qtdeclarative qttools-native" @@ -23,8 +23,4 @@ FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks" BBCLASSEXTEND = "native nativesdk" -SRCREV_FORMAT = "qttools_qlitehtml_litehtml" - -SRCREV_qttools = "14e0af4e3ca03f13f8ae2f9c62e6dd62d277ea4b" -SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4" -SRCREV_litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83" +SRCREV_FORMAT = "qttools_qttools-qlitehtml_qttools-litehtml" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 821aba1..0debddf 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -25,4 +25,3 @@ python split_translation_packages () { d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs)) } -SRCREV = "dbcf76dc2f7173906eee6c6f83630a90ab80b4a4" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index c4745f3..02fc533 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -115,4 +115,3 @@ FILES:${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "04be79feea84aa668a9f72ae41beafca7e9fd0a4" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index ffc74c4..350ba0a 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -37,4 +37,3 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "cfd65d318546162c1f8fad48b43da8ab62d24369" diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index 1918201..ec03598 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -18,4 +18,3 @@ PACKAGECONFIG ?= "qml" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "e24d35a88d8f86cd0af450de801f9b9654db950a" diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index 778a17c..db7d770 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "f4a6e71c448a8d058658c3e9e52adee5d0b947bf"