mx/lttng-*: Fix git branch references

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>

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 5657469bd628e75e6781c782cb4f00bf20106b14..ce35b61eb1304f9d5232c7972d00b7ea27e19782 100644 (file)
--- 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 f293376e1ee77342d191be398be66e3a241f45c8..dd065463ae640f556e9faf00101569eb63147d68 100644 (file)
--- 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 2f6e5048c2ff4e14e64df2edf7c08d50a48d66cc..e0ce56456701efa01568f1ecaa89475e7648c570 100644 (file)
--- 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 ae52ee8ad3f34e250667eb26c86a7f9a5726a8a1..bfcd3b64c9387eb1f7edd1b556cb154db72d8d63 100644 (file)
--- 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"