diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-14 09:29:53 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:16:18 +0100 |
commit | 3e2058f2e735bbfd15723ce9de27ad8df78a5500 (patch) | |
tree | d10de5f6f06397d0c42f8fcf168c12ef254b0646 | |
parent | c7cd9cb4661dd1623368d39e66c716f2222d357b (diff) | |
download | meta-qt5-3e2058f2e735bbfd15723ce9de27ad8df78a5500.tar.gz |
qt5: allow overriding git protocol used with QT_GIT uri
Add option QT_GIT_PROTOCOL to specify the protocol to be used
with the QT_GIT uri.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | conf/layer.conf | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index f83bd967..b7207e63 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -28,3 +28,4 @@ LICENSE_PATH += "${LAYERDIR}/licenses" | |||
28 | IMAGE_FEATURES[validitems] += "qtcreator-debug" | 28 | IMAGE_FEATURES[validitems] += "qtcreator-debug" |
29 | 29 | ||
30 | QT_GIT ?= "git://github.com/qtproject" | 30 | QT_GIT ?= "git://github.com/qtproject" |
31 | QT_GIT_PROTOCOL ?= "git" | ||
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 172a170e..f8fb38b7 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -6,7 +6,7 @@ QT_MODULE_BRANCH ?= "5.6" | |||
6 | 6 | ||
7 | # each module needs to define valid SRCREV | 7 | # each module needs to define valid SRCREV |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ | 9 | ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \ |
10 | " | 10 | " |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |