diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 16:24:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 16:27:13 +0000 |
| commit | 4bac6a83b34374a9abc8eac9116302af9f49f427 (patch) | |
| tree | 424d07ffc6a7932a3cafa5fa5e608afb97d8a4ef | |
| parent | 0b962a5f4bfe54ec3a2ab66045a4155dfa9437ba (diff) | |
| download | poky-4bac6a83b34374a9abc8eac9116302af9f49f427.tar.gz | |
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.
(From OE-Core rev: 1a61a104c29b001f0c1f52534c4a9a9d12d69bbb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb | 2 |
4 files changed, 4 insertions, 4 deletions
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 5657469bd6..ce35b61eb1 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 | |||
| 4 | SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" | 4 | SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" |
| 5 | PV = "1.4.7+git${SRCPV}" | 5 | PV = "1.4.7+git${SRCPV}" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/clutter-project/mx.git \ | 7 | SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ |
| 8 | file://fix-build-dir.patch \ | 8 | file://fix-build-dir.patch \ |
| 9 | file://fix-test-includes.patch \ | 9 | file://fix-test-includes.patch \ |
| 10 | " | 10 | " |
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 f293376e1e..dd065463ae 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 | |||
| 13 | SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377" | 13 | SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377" |
| 14 | PV = "2.3.3" | 14 | PV = "2.3.3" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://git.lttng.org/lttng-modules.git \ | 16 | SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \ |
| 17 | file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" | 17 | file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" |
| 18 | 18 | ||
| 19 | export INSTALL_MOD_DIR="kernel/lttng-modules" | 19 | 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 2f6e5048c2..e0ce564567 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" | |||
| 15 | SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860" | 15 | SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860" |
| 16 | PV = "v2.3.1" | 16 | PV = "v2.3.1" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://git.lttng.org/lttng-tools.git \ | 18 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.3 \ |
| 19 | file://runtest.patch \ | 19 | file://runtest.patch \ |
| 20 | file://run-ptest \ | 20 | file://run-ptest \ |
| 21 | " | 21 | " |
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 ae52ee8ad3..bfcd3b64c9 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" | |||
| 21 | PV = "2.3.1" | 21 | PV = "2.3.1" |
| 22 | PE = "2" | 22 | PE = "2" |
| 23 | 23 | ||
| 24 | SRC_URI = "git://git.lttng.org/lttng-ust.git \ | 24 | SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.3 \ |
| 25 | " | 25 | " |
| 26 | 26 | ||
| 27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
