From 3af90cf837c14cac301d5f77ade2684e394bbca5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Oct 2018 15:31:12 +0300 Subject: Add .gitignore and .tag files .tag file is used with git archive to have the sha1 included in the source package. Change-Id: I31cdd35aeb4f72f13d02e13f18abda3b311125f4 Reviewed-by: Mikko Gronoff --- .gitignore | 2 ++ .tag | 1 + 2 files changed, 3 insertions(+) create mode 100644 .gitignore create mode 100644 .tag diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ffab9a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.orig +*.rej diff --git a/.tag b/.tag new file mode 100644 index 0000000..6828f88 --- /dev/null +++ b/.tag @@ -0,0 +1 @@ +$Format:%H$ -- cgit v1.2.3-54-g00ecf From 9e428d2f631f68117e5aeb915a5fe7f09d81eab8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 30 Oct 2018 16:44:12 +0200 Subject: qtdeclarative: fix inconsistent QML_COMPILE_HASH value qtdeclarative and qtdeclarative-native may end up with different values for QML_COMPILE_HASH, which prevents running QML application when qtquickcompiler has been used. Change-Id: I9e3839b566996581bc40fa1472d7e7d07c82ce53 Reviewed-by: Mikko Gronoff --- ...ways-use-commit-sha1-for-QML_COMPILE_HASH.patch | 31 ++++++++++++++++++++++ .../recipes-qt/qt5/qtdeclarative_git.bbappend | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch new file mode 100644 index 0000000..a734f8a --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch @@ -0,0 +1,31 @@ +From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 2 Jul 2018 13:32:44 +0300 +Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH + +git describe can produce different strings for the same sha1, depending +on the version of git (length of short hash) and whether release tag was +in place when build was done (v5.11.1-0- vs. v5.11.0-66-). + +Instead use rev-parse to get the unambiguous commit sha1 which is also +what is used from the .tag file. + +Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559 +Reviewed-by: Simon Hausmann +--- + src/qml/qml.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index 940ebb325..a76a87b15 100644 +--- a/src/qml/qml.pro ++++ b/src/qml/qml.pro +@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH + !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { + QML_COMPILE_HASH = $$tag + } else:exists($$PWD/../../.git) { +- commit = $$system(git describe --tags --always --long --dirty) ++ commit = $$system(git rev-parse HEAD) + QML_COMPILE_HASH = $$commit + } + compile_hash_contents = \ diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend index d9144a8..ec82d40 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,6 +27,10 @@ ## ############################################################################ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch" + FILES_${PN}-plugins_mingw32 = " \ ${OE_QMAKE_PATH_PLUGINS}/*/*.dll \ " -- cgit v1.2.3-54-g00ecf From 7222b6f750db47eb91fd2779d6be56f74c3c1e68 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 14 Nov 2018 15:23:39 +0200 Subject: poky: update to latest revision (pyro) Mainly documentation related updates: * b0ede50 bitbake: tests/fetch: Update gnome.org urls after upstream changes * 2535349 poky.ent: Updated the release date to July 2018. * 604d82b bitbake: fetch2/__init__: Disable pseudo in runfetchcmd() * 6aefc80 bitbake: fetch2: fix import error for Python 3.6.5 * 7a9edf1 poky.ent: Updated release month variable to "June 2018" * dbf2510 documentation: Updated release date scheme to use variable. * 24344d5 documentation: Updated Manual Notes * 9b7bc41 build-appliance-image: Update to pyro head revision Task-number: QTBUG-71658 Change-Id: Ibf162e956ededabac21dbd14fe709f940d9e2ecd Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index c7b45aa..3910d63 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -18,7 +18,7 @@ Date: Thu, 15 Nov 2018 12:24:44 +0200 Subject: Revert "qtdeclarative: fix inconsistent QML_COMPILE_HASH value" Applied via meta-qt5 layer update in the next commit. This reverts commit 9e428d2f631f68117e5aeb915a5fe7f09d81eab8. Change-Id: I81765199803a5bc7b95b8c02a83aa42f0ce9a594 Reviewed-by: Samuli Piippo --- ...ways-use-commit-sha1-for-QML_COMPILE_HASH.patch | 31 ---------------------- .../recipes-qt/qt5/qtdeclarative_git.bbappend | 4 --- 2 files changed, 35 deletions(-) delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch deleted file mode 100644 index a734f8a..0000000 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Mon, 2 Jul 2018 13:32:44 +0300 -Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH - -git describe can produce different strings for the same sha1, depending -on the version of git (length of short hash) and whether release tag was -in place when build was done (v5.11.1-0- vs. v5.11.0-66-). - -Instead use rev-parse to get the unambiguous commit sha1 which is also -what is used from the .tag file. - -Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559 -Reviewed-by: Simon Hausmann ---- - src/qml/qml.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index 940ebb325..a76a87b15 100644 ---- a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { - QML_COMPILE_HASH = $$tag - } else:exists($$PWD/../../.git) { -- commit = $$system(git describe --tags --always --long --dirty) -+ commit = $$system(git rev-parse HEAD) - QML_COMPILE_HASH = $$commit - } - compile_hash_contents = \ diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend index ec82d40..d9144a8 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,10 +27,6 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch" - FILES_${PN}-plugins_mingw32 = " \ ${OE_QMAKE_PATH_PLUGINS}/*/*.dll \ " -- cgit v1.2.3-54-g00ecf