diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-devtools/uftrace | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/uftrace')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch | 39 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb) | 9 |
2 files changed, 5 insertions, 43 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch deleted file mode 100644 index fe7aac931..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cdf7f2e394fcfb93a61f509ae3388f29540a6b35 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Sep 2018 11:56:13 -0700 -Subject: [PATCH] include dlfcn.h for RTLD_DEFAULT - -Fixes -plthook.c:128:41: error: use of undeclared identifier 'RTLD_DEFAULT' - -Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/487] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libmcount/plthook.c | 1 + - utils/debug.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libmcount/plthook.c b/libmcount/plthook.c -index d9d84f0..d54f5e8 100644 ---- a/libmcount/plthook.c -+++ b/libmcount/plthook.c -@@ -6,6 +6,7 @@ - #include <sys/mman.h> - #include <pthread.h> - #include <assert.h> -+#include <dlfcn.h> - - /* This should be defined before #include "utils.h" */ - #define PR_FMT "mcount" -diff --git a/utils/debug.c b/utils/debug.c -index 2134b09..5460def 100644 ---- a/utils/debug.c -+++ b/utils/debug.c -@@ -13,6 +13,7 @@ - #include <assert.h> - #include <limits.h> - #include <inttypes.h> -+#include <dlfcn.h> - - #include "utils/utils.h" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb index ca38e6aa2..4f4016895 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb @@ -10,10 +10,9 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -# v0.8.3 -SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" +# v0.9.2 +SRCREV = "66fc1fb973f4a44aecd216541405ffe05196f11e" SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \ " S = "${WORKDIR}/git" @@ -21,9 +20,11 @@ LDFLAGS_append_libc-musl = " -largp" def set_target_arch(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match(r'i.86', arch, re.I): return 'i386' + elif re.match('armeb', arch, re.I): + return 'arm' else: return arch |