[oe] [meta-qt5][PATCH] qt5: add QT_GIT to define git repo for Qt core components

[Andre McCurdy]

On Fri, Mar 13, 2015 at 6:50 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Thu, Mar 12, 2015 at 08:50:41PM -0700, Andre McCurdy wrote:
>> 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.

> 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.

>
> Regards,
>
>> Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
>> ---
>>  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(-)
>>
>> diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
>> index df80407..9832eee 100644
>> --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
>> +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
>> @@ -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
>> diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
>> index 84ddf49..a2d96a2 100644
>> --- a/recipes-qt/qt5/qt5-git.inc
>> +++ b/recipes-qt/qt5/qt5-git.inc
>> @@ -1,11 +1,13 @@
>>  # Copyright (C) 2012 O.S. Systems Software LTDA.
>>  # Copyright (C) 2013-2014 Martin Jansa <martin.jansa at gmail.com>
>>
>> +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"
>> diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
>> index 5a308d4..e558ee6 100644
>> --- a/recipes-qt/qt5/qtbase-native_git.bb
>> +++ b/recipes-qt/qt5/qtbase-native_git.bb
>> @@ -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
>> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
>> index 549c92a..1be31ea 100644
>> --- a/recipes-qt/qt5/qtbase_git.bb
>> +++ b/recipes-qt/qt5/qtbase_git.bb
>> @@ -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
>>
>> --