Patchwork mx/lttng-*: Fix git branch references

login
register
mail settings
Submitter Richard Purdie
Date Dec. 5, 2013, 4:24 p.m.
Message ID <1386260688.25847.27.camel@ted>
Download mbox | patch
Permalink /patch/62921/
State Accepted
Commit 4bac6a83b34374a9abc8eac9116302af9f49f427
Headers show

Comments

Richard Purdie - Dec. 5, 2013, 4:24 p.m.
Ensure the right branches are set in SRC_URI to match the revisions
used. This resolves certain fetch failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
index 5657469..ce35b61 100644
--- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -4,7 +4,7 @@  require mx.inc
 SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
 PV = "1.4.7+git${SRCPV}"
 
-SRC_URI = "git://github.com/clutter-project/mx.git \
+SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
 	   file://fix-build-dir.patch \
 	   file://fix-test-includes.patch \
 	  "
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
index f293376..dd06546 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
@@ -13,7 +13,7 @@  inherit module
 SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
-SRC_URI = "git://git.lttng.org/lttng-modules.git \
+SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
            file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb b/meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb
index 2f6e504..e0ce564 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb
@@ -15,7 +15,7 @@  RDEPENDS_${PN}-ptest += "make"
 SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
 PV = "v2.3.1"
 
-SRC_URI = "git://git.lttng.org/lttng-tools.git \
+SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.3 \
            file://runtest.patch \
            file://run-ptest \
 	  "
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb
index ae52ee8..bfcd3b6 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb
@@ -21,7 +21,7 @@  SRCREV = "535d0408caee93577c2b4d8ad3cd672fa97eac1d"
 PV = "2.3.1"
 PE = "2"
 
-SRC_URI = "git://git.lttng.org/lttng-ust.git \
+SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.3 \
 	   "
 
 S = "${WORKDIR}/git"