From f5b03208c0ae0f47dddec6e39712fb0f1d041ebc Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 13 Jul 2015 19:51:57 -0700 Subject: lttng-ust: 2.6.1 -> 2.6.2 * Remove add-aarch64.patch since it is already in the source. * Rename lttng-ust_2.6.1.bb -> lttng-ust_git.bb Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../lttng/lttng-ust/add-aarch64.patch | 19 ------------ meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb | 34 ---------------------- meta/recipes-kernel/lttng/lttng-ust_git.bb | 34 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb create mode 100644 meta/recipes-kernel/lttng/lttng-ust_git.bb diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch deleted file mode 100644 index cec5410369..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch +++ /dev/null @@ -1,19 +0,0 @@ -lttng-ust: add aarch64 recognition - -Treat the same as "arm". - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/configure.ac -+++ b/configure.ac -@@ -230,6 +230,7 @@ changequote([,])dnl - s390) NO_UNALIGNED_ACCESS=1 ;; - s390x) NO_UNALIGNED_ACCESS=1 ;; - arm*) NO_UNALIGNED_ACCESS=1 ;; -+ aarch64) NO_UNALIGNED_ACCESS=1 ;; - mips*) NO_UNALIGNED_ACCESS=1 ;; - tile*) NO_UNALIGNED_ACCESS=1 ;; - *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb deleted file mode 100644 index d083f86695..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" -DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." -HOMEPAGE = "http://lttng.org/ust" -BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" - -LICENSE = "LGPLv2.1+ & MIT & 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 lib_package - -DEPENDS = "liburcu util-linux" -RDEPENDS_${PN}-bin = "python-core" - -# For backwards compatibility after rename -RPROVIDES_${PN} = "lttng2-ust" -RREPLACES_${PN} = "lttng2-ust" -RCONFLICTS_${PN} = "lttng2-ust" - -SRCREV = "369ee1a1b12338e5158d24f9c879f5dd52f1aba2" -PE = "2" - -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ - file://lttng-ust-doc-examples-disable.patch \ - file://add-aarch64.patch \ - file://lttng-ust-Fix-live-timer-calculation-error.patch \ - " - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb new file mode 100644 index 0000000000..ae4afd3d89 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" +DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." +HOMEPAGE = "http://lttng.org/ust" +BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" + +LICENSE = "LGPLv2.1+ & MIT & 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 lib_package + +DEPENDS = "liburcu util-linux" +RDEPENDS_${PN}-bin = "python-core" + +# For backwards compatibility after rename +RPROVIDES_${PN} = "lttng2-ust" +RREPLACES_${PN} = "lttng2-ust" +RCONFLICTS_${PN} = "lttng2-ust" + +SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6" +PE = "2" +PV = "2.6.2+git${SRCPV}" + +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ + file://lttng-ust-doc-examples-disable.patch \ + file://lttng-ust-Fix-live-timer-calculation-error.patch \ + " + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ( cd ${S}; ${S}/bootstrap ) +} -- cgit v1.2.3