Re: [meta-qt5][PATCH v2] qt5-git, *qtbase*, qt5everywheredemo: Fetch from code.qt.io

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4919 bytes --]

On Tue, Mar 10, 2015 at 09:37:46PM +0100, Frederico Cadete wrote:
> From: Frederico Cadete <frederico.cadete@awtce.be>
> 
> Gitorious disabled the git:// protocol, breaking fetches.
> Also, this service is scheduled to stop in May 2015, so move to
> code.qt.io.
> 
> Signed-off-by: Frederico Cadete <frederico@cadete.eu>
> ---
>  recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +-
>  recipes-qt/qt5/nativesdk-qtbase_git.bb       | 2 +-
>  recipes-qt/qt5/qt5-git.inc                   | 2 +-
>  recipes-qt/qt5/qtbase-native_git.bb          | 2 +-
>  recipes-qt/qt5/qtbase_git.bb                 | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
> index 4f7022c..60edaa4 100644
> --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
> +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b"
>  DEPENDS = "qtdeclarative qtgraphicaleffects"
>  
>  SRCREV = "9a868f96ee63c21ceda890d8dfc9d33f093d1b6d"
> -SRC_URI = "git://gitorious.org/qt-labs/qt5-everywhere-demo.git"
> +SRC_URI = "git://code.qt.io/qt-labs/qt5-everywhere-demo.git"

This one doesn't work:
WARNING: Failed to fetch URL git://code.qt.io/qt-labs/qt5-everywhere-demo.git, attempting MIRRORS if available
ERROR: Fetcher failure: Unable to find revision 9a868f96ee63c21ceda890d8dfc9d33f093d1b6d in branch master even from upstream
ERROR: Function failed: Fetcher failure for URL: 'git://code.qt.io/qt-labs/qt5-everywhere-demo.git'. Unable to fetch URL from any source.
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5everywheredemo/1.0-r0/temp/log.do_fetch.12973
NOTE: recipe qt5everywheredemo-1.0-r0: task do_fetch: Failed
ERROR: Task 6740 (/home/jenkins/oe/world/shr-core/meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb, do_fetch) failed with exit code '1'

SRCREV 9a868f96ee63c21ceda890d8dfc9d33f093d1b6d doesn't exist on code.qt.io

It was initial commit in gitorious repo:
commit 9a868f96ee63c21ceda890d8dfc9d33f093d1b6d
Author: Sergio Ahumada <sergio.ahumada@digia.com>
Date:   Wed Jul 3 12:09:40 2013 +0200

    Initial commit

This is exactly matching with this commit in code.qt.io:
commit c17fe9e0ec0882ac4c4dc1168095f569acab5d09
Author: Kimmo Ollila <kimmo.ollila@digia.com>
Date:   Wed Jun 19 13:02:05 2013 +0300

    Fixed radio crash on application close
    
    Change-Id: Iaae40f9112e70ac9ac09b7127128560470e5ca91
    Reviewed-by: Lasse Räihä <lasse.raiha@digia.com>

So I'll update SRCREV in this recipe, you don't need to resend.

>  S = "${WORKDIR}/git/QtDemo"
>  
> diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
> index 9194a83..df80407 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://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
> +    git://code.qt.io/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 da962b8..84ddf49 100644
> --- a/recipes-qt/qt5/qt5-git.inc
> +++ b/recipes-qt/qt5/qt5-git.inc
> @@ -5,7 +5,7 @@ QT_MODULE_BRANCH ?= "5.4"
>  
>  # each module needs to define valid SRCREV
>  SRC_URI += " \
> -    git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
> +    git://code.qt.io/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 cebc021..5a308d4 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://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
> +    git://code.qt.io/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 d33eb68..549c92a 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://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
> +    git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
>  "
>  
>  # common for qtbase-native, qtbase-nativesdk and qtbase
> -- 
> 2.1.4
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]