diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/fix-powerpc64.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust_0.16.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_0.15.bb) | 9 |
2 files changed, 4 insertions, 22 deletions
diff --git a/meta/recipes-kernel/lttng/fix-powerpc64.patch b/meta/recipes-kernel/lttng/fix-powerpc64.patch deleted file mode 100644 index 3c3484c678..0000000000 --- a/meta/recipes-kernel/lttng/fix-powerpc64.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted | ||
| 2 | |||
| 3 | Add bit to detect if we are running on powerpc64 and treat it the | ||
| 4 | same as ppc64 | ||
| 5 | |||
| 6 | Index: ust-0.15/configure.ac | ||
| 7 | =================================================================== | ||
| 8 | --- ust-0.15.orig/configure.ac | ||
| 9 | +++ ust-0.15/configure.ac | ||
| 10 | @@ -111,6 +111,7 @@ changequote([,])dnl | ||
| 11 | x86_64) LIBFORMAT="elf64-x86-64" ;; | ||
| 12 | powerpc) LIBFORMAT="elf32-powerpc" ;; | ||
| 13 | ppc64) LIBFORMAT="elf64-powerpc" ;; | ||
| 14 | + powerpc64) LIBFORMAT="elf64-powerpc" ;; | ||
| 15 | s390) LIBFORMAT="elf32-s390" ;; | ||
| 16 | s390x) LIBFORMAT="elf64-s390" ;; | ||
| 17 | armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;; | ||
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb index 9dd4658643..701bda9542 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SUMMARY = "Linux Trace Toolkit Userspace Tracer" | 1 | SUMMARY = "Linux Trace Toolkit Userspace Tracer" |
| 2 | DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code" | 2 | DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code" |
| 3 | HOMEPAGE = "http://lttng.org/ust" | 3 | HOMEPAGE = "http://lttng.org/ust" |
| 4 | BUGTRACKER = "n/a" | 4 | BUGTRACKER = "http://lttng.org/project/issues" |
| 5 | 5 | ||
| 6 | LICENSE = "LGPLv2.1+ & BSD" | 6 | LICENSE = "LGPLv2.1+ & BSD" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ |
| @@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ | |||
| 10 | 10 | ||
| 11 | DEPENDS = "liburcu" | 11 | DEPENDS = "liburcu" |
| 12 | 12 | ||
| 13 | PR = "r3" | 13 | PR = "r0" |
| 14 | 14 | ||
| 15 | SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz" | 15 | SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz" |
| 16 | SRC_URI_append_powerpc64 = " file://fix-powerpc64.patch" | ||
| 17 | 16 | ||
| 18 | SRC_URI[md5sum] = "86c71486a70695dc0b2171ad16fc82b3" | 17 | SRC_URI[md5sum] = "8e5d5de47bfff29f50439d192ad1e478" |
| 19 | SRC_URI[sha256sum] = "7ff7ecdc051c0649d5fd21b5ceff4895ca95dc34f14cdc04e50de13cfd1903c5" | 18 | SRC_URI[sha256sum] = "88167741b1fbf335e006f0208d8c41784705e28adac84df71d3d9f6c58191dab" |
| 20 | 19 | ||
| 21 | 20 | ||
| 22 | S = "${WORKDIR}/ust-${PV}" | 21 | S = "${WORKDIR}/ust-${PV}" |
