Skip to contentSkip to conversation

qt5-git.inc: drop nobranch=1

PATCH In review Martin Jansa 2 participants 4 messages Feb 22, 2018 – Feb 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 qt5-git.inc: drop nobranch=1

* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <[email protected]>
Date: Thu Jan 26 16:54:50 2017 +0200

Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all

---
 recipes-qt/qt5/qt5-git.inc              | 6 +++---
 recipes-qt/qt5/qtknx_git.bb             | 2 ++
 recipes-qt/qt5/qtmqtt_git.bb            | 2 ++
 recipes-qt/qt5/qtwebkit-examples_git.bb | 2 ++
 recipes-qt/qt5/qtwebkit_git.bb          | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)
recipes-qt/qt5/qt5-git.inc +3 -3
index 7ee0643..beba913 100644
@@ -1,9 +1,9 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2018 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.10"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_BRANCH ?= "5.10.1"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
recipes-qt/qt5/qtknx_git.bb +2 -0
index 5e01e3c..fa981ab 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
recipes-qt/qt5/qtmqtt_git.bb +2 -0
index b705f7c..90c255d 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
recipes-qt/qt5/qtwebkit-examples_git.bb +2 -0
index 3e3e4a0..114fab7 100644
@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/qtwebkit_git.bb +2 -0
index 5dee6a4..b23d4d6 100644
@@ -87,4 +87,6 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
Signature · 1 line
2.15.1
#1 lore raw

Note that the Qt release branches (5.x.x) will usually disappear right after the release, which will break the build without nobranch=1

Quoted 88 lines · Martin Jansa

* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <[email protected]>
Date: Thu Jan 26 16:54:50 2017 +0200

Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all

---
 recipes-qt/qt5/qt5-git.inc              | 6 +++---
 recipes-qt/qt5/qtknx_git.bb             | 2 ++
 recipes-qt/qt5/qtmqtt_git.bb            | 2 ++
 recipes-qt/qt5/qtwebkit-examples_git.bb | 2 ++
 recipes-qt/qt5/qtwebkit_git.bb          | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)
recipes-qt/qt5/qt5-git.inc +3 -3
index 7ee0643..beba913 100644
@@ -1,9 +1,9 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2018 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.10"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_BRANCH ?= "5.10.1"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
recipes-qt/qt5/qtknx_git.bb +2 -0
index 5e01e3c..fa981ab 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
recipes-qt/qt5/qtmqtt_git.bb +2 -0
index b705f7c..90c255d 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
recipes-qt/qt5/qtwebkit-examples_git.bb +2 -0
index 3e3e4a0..114fab7 100644
@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/qtwebkit_git.bb +2 -1
index 5dee6a4..b23d4d6 100644
@@ -87,4 +87,6 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw

Why do they disappear? Or why aren't they included in 5.x branches at the time of the release so that we can use just 5.x without the SRCREVs being only on 5.x.x branches?

Quoted 99 lines · Samuli Piippo

Note that the Qt release branches (5.x.x) will usually disappear right after the release, which will break the build without nobranch=1

recipes-qt/qt5/

Quoted 59 lines · Martin Jansa

* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <[email protected]>
Date: Thu Jan 26 16:54:50 2017 +0200

Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all

---
 recipes-qt/qt5/qt5-git.inc              | 6 +++---
 recipes-qt/qt5/qtknx_git.bb             | 2 ++
 recipes-qt/qt5/qtmqtt_git.bb            | 2 ++
 recipes-qt/qt5/qtwebkit-examples_git.bb | 2 ++
 recipes-qt/qt5/qtwebkit_git.bb          | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)
recipes-qt/qt5/qt5-git.inc +3 -3
index 7ee0643..beba913 100644
@@ -1,9 +1,9 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2018 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.10"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_BRANCH ?= "5.10.1"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
recipes-qt/qt5/qtknx_git.bb +2 -0
index 5e01e3c..fa981ab 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
recipes-qt/qt5/qtmqtt_git.bb +2 -0
index b705f7c..90c255d 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebkit-examples_git.bb +0 -0

qtwebkit-examples_git.bb

recipes-qt/qt5/qtwebkit-examples_git.bb DEPENDS += "qtwebkit qtxmlpatterns" · line 18

Quoted 6 lines

index 3e3e4a0..114fab7 100644

recipes-qt/qt5/qtwebkit-examples_git.bb +0 -0
@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL',

'openssl', 'ca-certificates', '', d)}"

recipes-qt/qt5/

Quoted 5 lines
recipes-qt/qt5/qtwebkit-examples_git.bb +2 -0
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebkit_git.bb +0 -0

qtwebkit_git.bb

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev

Quoted 4 lines

index 5dee6a4..b23d4d6 100644

recipes-qt/qt5/qtwebkit_git.bb +0 -0
@@ -87,4 +87,6 @@ PACKAGES_remove = "${PN}-examples-dev

${PN}-examples-staticdev ${PN}-examples-db

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev · line 87

Quoted 1 line
recipes-qt/qt5/qtwebkit_git.bb +0 -0
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586',

'i386').replace('i686', 'i386') }"

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev · line 88

Quoted 1 line
recipes-qt/qt5/qtwebkit_git.bb +0 -0
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_

LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"

Quoted 12 lines
recipes-qt/qt5/qtwebkit_git.bb +2 -1
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#3 lore raw

What I don't understand is that why are we checking if SRCREV is found from the branch.
Full git repo is always fetched and if the SHA1 is valid, it will be found, regardless of from which branch it is accessible at the time.

Quoted 108 lines · Martin Jansa

Why do they disappear? Or why aren't they included in 5.x branches at the time of the release so that we can use just 5.x without the SRCREVs being only on 5.x.x branches?

Quoted 100 lines · Samuli Piippo

Note that the Qt release branches (5.x.x) will usually disappear right after the release, which will break the build without nobranch=1

Quoted 95 lines · Martin Jansa

* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <[email protected]>
Date: Thu Jan 26 16:54:50 2017 +0200

Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all

---
 recipes-qt/qt5/qt5-git.inc              | 6 +++---
 recipes-qt/qt5/qtknx_git.bb             | 2 ++
 recipes-qt/qt5/qtmqtt_git.bb            | 2 ++
 recipes-qt/qt5/qtwebkit-examples_git.bb | 2 ++
 recipes-qt/qt5/qtwebkit_git.bb          | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)
recipes-qt/qt5/qt5-git.inc +3 -3
index 7ee0643..beba913 100644
@@ -1,9 +1,9 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2018 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.10"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_BRANCH ?= "5.10.1"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
recipes-qt/qt5/qtknx_git.bb +2 -0
index 5e01e3c..fa981ab 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
recipes-qt/qt5/qtmqtt_git.bb +2 -0
index b705f7c..90c255d 100644
@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+QT_MODULE_BRANCH = "5.10"
+
 SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
recipes-qt/qt5/qtwebkit-examples_git.bb +0 -0
index 3e3e4a0..114fab7 100644
@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples +=
 "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates',

'', d)}"

recipes-qt/qt5/qtwebkit-examples_git.bb +2 -0
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/qtwebkit_git.bb +0 -0
index 5dee6a4..b23d4d6 100644
@@ -87,4 +87,6 @@ PACKAGES_remove = "${PN}-examples-dev

${PN}-examples-staticdev ${PN}-examples-db
RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586',
'i386').replace('i686', 'i386') }"
export
RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"

recipes-qt/qt5/qtwebkit_git.bb +2 -1
+QT_MODULE_BRANCH = "5.9"
+
 SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel