aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb2
-rw-r--r--meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb2
-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 = ""
# which means we can not use syscall() to call it. So we ignore
# it for x86_64/uclibc
-LTTNGUST = "lttng2-ust"
+LTTNGUST = "lttng-ust"
LTTNGUST_libc-uclibc = ""
LTTNGUST_mips = ""
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 \
file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
-DEPENDS = "liburcu popt lttng2-ust"
+DEPENDS = "liburcu popt lttng-ust"
SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
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
DEPENDS = "liburcu util-linux"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
PV = "2.1.0"
PR = "r0"