From: Philippe Proulx <eeppeliteloop@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1
Date: Mon, 31 Oct 2016 03:46:16 -0400 [thread overview]
Message-ID: <20161031074624.7576-2-eeppeliteloop@gmail.com> (raw)
In-Reply-To: <20161031074624.7576-1-eeppeliteloop@gmail.com>
The two current patches are removed because they were merged upstream.
The new patch is needed to build with uClibc. It was also submitted
upstream, but not merged as is yet. Defining NT_GNU_BUILD_ID to 3 when
it's not defined seems like it's something done in other projects. This
definition's value should never change (number of the build ID note
section in ELF objects).
LTTng-UST now has its man pages written in AsciiDoc and they get
converted to troff at build time. This is not needed in a Buildroot
image anyway.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
Changes v2 -> v3:
- Add link to original patch in patch file.
- Move Python agent stuff to another patch.
Changes v1 -> v2:
- Detailed commit message.
- Detailed patch messages.
...lf.c-define-NT_GNU_BUILD_ID-if-not-define.patch | 34 ++++++++++++++++++++++
package/lttng-libust/lttng-libust.hash | 10 +++----
package/lttng-libust/lttng-libust.mk | 8 ++---
3 files changed, 41 insertions(+), 11 deletions(-)
create mode 100644 package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
diff --git a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
new file mode 100644
index 0000000..1788a04
--- /dev/null
+++ b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
@@ -0,0 +1,34 @@
+From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+Date: Sat, 29 Oct 2016 13:32:57 -0400
+Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
+
+On uClibc, NT_GNU_BUILD_ID is not defined, so we define it
+manually in this case.
+
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: grabbed from this pull request:
+ https://github.com/lttng/lttng-ust/pull/39
+]
+---
+ liblttng-ust/lttng-ust-elf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
+index 5f27920..beaa7f3 100644
+--- a/liblttng-ust/lttng-ust-elf.c
++++ b/liblttng-ust/lttng-ust-elf.c
+@@ -29,6 +29,10 @@
+
+ #define BUF_LEN 4096
+
++#ifndef NT_GNU_BUILD_ID
++# define NT_GNU_BUILD_ID 3
++#endif
++
+ /*
+ * Retrieve the nth (where n is the `index` argument) phdr (program
+ * header) from the given elf instance.
+--
+2.9.3
+
diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index 1494acf..a4a2907 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -1,6 +1,6 @@
-# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1
-sha1 597ebecb885debb58c263de57f30b1096d4eefc6 lttng-ust-2.7.1.tar.bz2
+# From http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2.{md5,sha1}
+md5 be505077245dc05f93370a565eec15f4 lttng-ust-2.8.1.tar.bz2
+sha1 8bebdcbcb453d2643fb226dbe92de61764f1ee3b lttng-ust-2.8.1.tar.bz2
-# Locally computed
-sha1 2e79c98e458b2e052930fb81441e6ca8377a2ed7 787364e8bac9a146f9d65c763633c2b75eb76463.patch
-sha1 cf77ec415111f77573be7917d9b62d8e49dc6304 30307a67b48641875b122d8f832bbfb454e95d92.patch
+# Locally generated
+sha256 6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a lttng-ust-2.8.1.tar.bz2
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 61ffed4..feeeb43 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,17 +5,13 @@
################################################################################
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.7.1
+LTTNG_LIBUST_VERSION = 2.8.1
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
-
-LTTNG_LIBUST_PATCH = \
- https://github.com/lttng/lttng-ust/commit/787364e8bac9a146f9d65c763633c2b75eb76463.patch \
- https://github.com/lttng/lttng-ust/commit/30307a67b48641875b122d8f832bbfb454e95d92.patch
-
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
+LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
--
2.9.3
next prev parent reply other threads:[~2016-10-31 7:46 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
2016-10-31 7:46 ` Philippe Proulx [this message]
2016-10-31 9:42 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:16 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:26 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
2016-10-31 9:57 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
2016-10-31 10:12 ` Yann E. MORIN
2016-11-01 14:30 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
2016-10-31 10:14 ` Yann E. MORIN
2016-10-31 16:39 ` Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
2016-10-31 11:24 ` Yann E. MORIN
2016-10-31 12:43 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
2016-12-13 23:02 ` Thomas Petazzoni
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
2016-11-02 22:29 ` Thomas Petazzoni
2016-11-02 23:07 ` Philippe Proulx
2016-11-03 8:25 ` Thomas Petazzoni
2016-11-03 17:41 ` Philippe Proulx
2016-12-13 23:03 ` Thomas Petazzoni
2016-10-31 10:39 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Yann E. MORIN
2016-10-31 16:42 ` Philippe Proulx
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031074624.7576-2-eeppeliteloop@gmail.com \
--to=eeppeliteloop@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox