From 44a485f7a6eff41523a1a37526021c01ec75daef Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 11 Jan 2013 17:28:47 -0600 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | 2 +- meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb | 35 ++++++++++++++++++++++ meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb | 30 ------------------- 3 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb (limited to 'meta/recipes-kernel') 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/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb new file mode 100644 index 0000000000..1076bde574 --- /dev/null +++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0" +DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes." +HOMEPAGE = "http://lttng.org/lttng2.0" +BUGTRACKER = "n/a" + +LICENSE = "LGPLv2.1+ & BSD & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ + file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ + file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" + +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" + +SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ${S}/bootstrap +} + +# Due to liburcu not building for MIPS currently this recipe needs to +# be limited also. +# So here let us first suppport x86/arm/powerpc platforms now. +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb deleted file mode 100644 index 439e0063cf..0000000000 --- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0" -DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes." -HOMEPAGE = "http://lttng.org/lttng2.0" -BUGTRACKER = "n/a" - -LICENSE = "LGPLv2.1+ & BSD & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ - file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ - file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" - -inherit autotools - -DEPENDS = "liburcu util-linux" - -SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19" -PV = "2.1.0" -PR = "r0" - -SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ${S}/bootstrap -} - -# Due to liburcu not building for MIPS currently this recipe needs to -# be limited also. -# So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' -- cgit v1.2.3-54-g00ecf