diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2013-01-11 17:28:47 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-16 11:57:32 +0000 |
commit | 44a485f7a6eff41523a1a37526021c01ec75daef (patch) | |
tree | 04f0feea69942b4c1e971bb33a33c34eb8a9ac1a | |
parent | 4a5ad289d1826957cd22ae9af36bbd127b4816b0 (diff) | |
download | poky-44a485f7a6eff41523a1a37526021c01ec75daef.tar.gz |
lttng2-ust: rename to lttng-ust
recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
also removed the naming conflict that caused the lttng-2.0 version of
lttng-ust to be named lttng2-ust. lttng2-ust was the only lttng-2.0
recipe to be named in this way and since that was entirely due to the
conflict, we can go back to the consistent naming for it.
(From OE-Core rev: 3c927c39502061bdf3ef9fba1f0f6e7080f6c3cd)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb (renamed from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb) | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 591f33f99b..8f40c4e14a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | |||
@@ -46,7 +46,7 @@ SYSTEMTAP_aarch64 = "" | |||
46 | # which means we can not use syscall() to call it. So we ignore | 46 | # which means we can not use syscall() to call it. So we ignore |
47 | # it for x86_64/uclibc | 47 | # it for x86_64/uclibc |
48 | 48 | ||
49 | LTTNGUST = "lttng2-ust" | 49 | LTTNGUST = "lttng-ust" |
50 | LTTNGUST_libc-uclibc = "" | 50 | LTTNGUST_libc-uclibc = "" |
51 | LTTNGUST_mips = "" | 51 | LTTNGUST_mips = "" |
52 | LTTNGUST_aarch64 = "" | 52 | LTTNGUST_aarch64 = "" |
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb index 482b9a673f..16e1ccc7c7 100644 --- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb +++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ | |||
9 | file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" | 10 | file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" |
11 | 11 | ||
12 | DEPENDS = "liburcu popt lttng2-ust" | 12 | DEPENDS = "liburcu popt lttng-ust" |
13 | 13 | ||
14 | SRCREV = "917f768512b5d336d553b801f6c5308d90252a89" | 14 | SRCREV = "917f768512b5d336d553b801f6c5308d90252a89" |
15 | PV = "v2.1.0" | 15 | PV = "v2.1.0" |
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb index 439e0063cf..1076bde574 100644 --- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb +++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb | |||
@@ -12,6 +12,11 @@ inherit autotools | |||
12 | 12 | ||
13 | DEPENDS = "liburcu util-linux" | 13 | DEPENDS = "liburcu util-linux" |
14 | 14 | ||
15 | # For backwards compatibility after rename | ||
16 | RPROVIDES_${PN} = "lttng2-ust" | ||
17 | RREPLACES_${PN} = "lttng2-ust" | ||
18 | RCONFLICTS_${PN} = "lttng2-ust" | ||
19 | |||
15 | SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19" | 20 | SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19" |
16 | PV = "2.1.0" | 21 | PV = "2.1.0" |
17 | PR = "r0" | 22 | PR = "r0" |