diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-03-13 12:59:48 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-03-17 13:07:34 +0100 |
commit | 87235825459d376bf4537c9523eb2496e15893aa (patch) | |
tree | b7663fc6e7a68b1f924305718cdda6e8478ac7f0 | |
parent | 22c431e7a1fa525c75bf1fa48c82d01955001350 (diff) |
qt5: add QT_GIT to define git repo for Qt core components
Replace duplicated git URIs with a single definition in layer.conf.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index aacfd784..92558b33 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -26,3 +26,5 @@ BBFILE_PRIORITY_qt5-layer = "7" LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" + +QT_GIT ?= "git://code.qt.io" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index db5bbe6a..0546b00c 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 = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" -SRC_URI = "git://code.qt.io/qt-labs/qt5-everywhere-demo.git" +SRC_URI = "${QT_GIT}/qt-labs/qt5-everywhere-demo.git" S = "${WORKDIR}/git/QtDemo" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index df80407e..9832eee4 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 84ddf496..c8789980 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://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 5a308d4b..e558ee6d 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 549c92af..1be31ea5 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 |