Skip to contentSkip to conversation

qt5: add QT_GIT to define git repo for Qt core components

PATCH Superseded Andre McCurdy 2 participants 3 messages Mar 13, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Andre McCurdy

author
#0 lore raw

PATCH 1/1 qt5: add QT_GIT to define git repo for Qt core components

Replace four duplicate git URIs with a single definition.

Signed-off-by Andre McCurdy <[email protected]>
---
 recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +-
 recipes-qt/qt5/qt5-git.inc             | 4 +++-
 recipes-qt/qt5/qtbase-native_git.bb    | 2 +-
 recipes-qt/qt5/qtbase_git.bb           | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
recipes-qt/qt5/nativesdk-qtbase_git.bb +1 -1
index df80407..9832eee 100644
@@ -5,7 +5,7 @@ require ${PN}.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qt5-git.inc +3 -1
index 84ddf49..a2d96a2 100644
@@ -1,11 +1,13 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <[email protected]>
 
+QT_GIT ?= "git://code.qt.io"
+
 QT_MODULE_BRANCH ?= "5.4"
 
 # each module needs to define valid SRCREV
 SRC_URI += " \
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 S = "${WORKDIR}/git"
recipes-qt/qt5/qtbase-native_git.bb +1 -1
index 5a308d4..e558ee6 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\    
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qtbase_git.bb +1 -1
index 549c92a..1be31ea 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
Signature · 1 line
1.9.1
#1 lore raw
Quoted 1 line · Andre McCurdy

Replace four duplicate git URIs with a single definition.

Do you plan to override this location from somewhere else?

It doesn't even cover qt5everywheredemo recipe so I don't think it's worth it in this form, maybe if you move it to layer.conf and apply it for qt5everywheredemo as well.

Regards,

Quoted 74 lines
Signed-off-by Andre McCurdy <[email protected]>
---
 recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +-
 recipes-qt/qt5/qt5-git.inc             | 4 +++-
 recipes-qt/qt5/qtbase-native_git.bb    | 2 +-
 recipes-qt/qt5/qtbase_git.bb           | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
recipes-qt/qt5/nativesdk-qtbase_git.bb +1 -1
index df80407..9832eee 100644
@@ -5,7 +5,7 @@ require ${PN}.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qt5-git.inc +3 -1
index 84ddf49..a2d96a2 100644
@@ -1,11 +1,13 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <[email protected]>
 
+QT_GIT ?= "git://code.qt.io"
+
 QT_MODULE_BRANCH ?= "5.4"
 
 # each module needs to define valid SRCREV
 SRC_URI += " \
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 S = "${WORKDIR}/git"
recipes-qt/qt5/qtbase-native_git.bb +1 -1
index 5a308d4..e558ee6 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\    
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qtbase_git.bb +1 -1
index 549c92a..1be31ea 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
Signature · 7 lines
1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 4 lines · Martin Jansa
Quoted 1 line · Andre McCurdy

Replace four duplicate git URIs with a single definition.

Do you plan to override this location from somewhere else?

Yes, I think it's useful to have that option.

Quoted 3 lines

It doesn't even cover qt5everywheredemo recipe so I don't think it's worth it in this form, maybe if you move it to layer.conf and apply it for qt5everywheredemo as well.

I'll send a version 2.

Quoted 73 lines

Regards,

Quoted 70 lines
Signed-off-by Andre McCurdy <[email protected]>
---
 recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +-
 recipes-qt/qt5/qt5-git.inc             | 4 +++-
 recipes-qt/qt5/qtbase-native_git.bb    | 2 +-
 recipes-qt/qt5/qtbase_git.bb           | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
recipes-qt/qt5/nativesdk-qtbase_git.bb +1 -1
index df80407..9832eee 100644
@@ -5,7 +5,7 @@ require ${PN}.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qt5-git.inc +3 -1
index 84ddf49..a2d96a2 100644
@@ -1,11 +1,13 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <[email protected]>
 
+QT_GIT ?= "git://code.qt.io"
+
 QT_MODULE_BRANCH ?= "5.4"
 
 # each module needs to define valid SRCREV
 SRC_URI += " \
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 S = "${WORKDIR}/git"
recipes-qt/qt5/qtbase-native_git.bb +1 -1
index 5a308d4..e558ee6 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
recipes-qt/qt5/qtbase_git.bb +1 -2
index 549c92a..1be31ea 100644
@@ -2,7 +2,7 @@ require qt5-git.inc
 require ${PN}.inc
 
 SRC_URI = "\
-    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
--

1.9.1

--