From b4676f7da54fbeb8f99da52a2e0dd8626a46618c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Aug 2016 11:31:29 +0100 Subject: lttng-ust: Update 2.7.1 -> 2.8.1 Drop aarch64_be patch which is now upstream. Update doc patch to apply to latest version. Disable man generation in configure options to match docs patch (for now). Signed-off-by: Richard Purdie --- .../lttng-ust-add-support-for-aarch64_be.patch | 17 ----------------- .../lttng-ust/lttng-ust-doc-examples-disable.patch | 2 +- meta/recipes-kernel/lttng/lttng-ust_git.bb | 9 +++++---- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch deleted file mode 100644 index 9b37a4a330..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch +++ /dev/null @@ -1,17 +0,0 @@ -lttng-ust: add support for aarch64_be - -Upstream-Status: Pending - -Signed-off-by: Tudor Florea - -diff --ruN a/configure.ac b/configure.ac ---- a/configure.ac 2016-02-18 14:54:54.651713647 +0100 -+++ b/configure.ac 2016-02-18 14:56:11.057865297 +0100 -@@ -240,6 +240,7 @@ - s390x) NO_UNALIGNED_ACCESS=1 ;; - arm*) NO_UNALIGNED_ACCESS=1 ;; - aarch64) NO_UNALIGNED_ACCESS=1 ;; -+ aarch64_be) NO_UNALIGNED_ACCESS=1 ;; - mips*) NO_UNALIGNED_ACCESS=1 ;; - tile*) NO_UNALIGNED_ACCESS=1 ;; - *) diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch index b68a9899c9..caf0b8bcf7 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch @@ -11,7 +11,7 @@ Index: doc/Makefile.am --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ --SUBDIRS = . examples +-SUBDIRS = . man examples +SUBDIRS = . dist_man_MANS = man/lttng-gen-tp.1 \ diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb index f5a12b10b0..baff71f589 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_git.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb @@ -18,15 +18,16 @@ RPROVIDES_${PN} = "lttng2-ust" RREPLACES_${PN} = "lttng2-ust" RCONFLICTS_${PN} = "lttng2-ust" -SRCREV = "f89c1a3cf2b06a4970b9154c00ff6409870aefb5" +SRCREV = "514a87f3b64181e384399935a5708a8f85b0cc83" PE = "2" -PV = "2.7.1+git${SRCPV}" +PV = "2.8.1+git${SRCPV}" -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.7 \ +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \ file://lttng-ust-doc-examples-disable.patch \ - file://lttng-ust-add-support-for-aarch64_be.patch \ " +EXTRA_OECONF += "--disable-man-pages" + do_install_append() { # Patch python tools to use Python 3; they should be source compatible, but # still refer to Python 2 in the shebang -- cgit 1.2.3-korg