diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-devtools/uftrace | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
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.8.3.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb) | 23 |
2 files changed, 57 insertions, 5 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 new file mode 100644 index 000000000..fe7aac931 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch @@ -0,0 +1,39 @@ +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.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb index 82b179521..ca38e6aa2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb @@ -10,21 +10,34 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -SRCREV = "5af9ff9fa89c340617e52c8ed05798b352a7145c" -SRC_URI = "git://github.com/namhyung/${BPN}" +# v0.8.3 +SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" +SRC_URI = "git://github.com/namhyung/${BPN} \ + file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \ + " S = "${WORKDIR}/git" LDFLAGS_append_libc-musl = " -largp" -EXTRA_OECONF = "ARCH=${TARGET_ARCH}" + +def set_target_arch(d): + import re + arch = d.getVar('TARGET_ARCH', True) + if re.match(r'i.86', arch, re.I): + return 'i386' + else: + return arch + +EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ + with_elfutils=/use/libelf/from/sysroot" do_configure() { - ${S}/configure ${EXTRA_OECONF} + ${S}/configure ${EXTRA_UFTRACE_OECONF} } FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*.so" -COMPATIBLE_HOST = "(x86_64|aarch64|arm)" +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" # uftrace supports armv6 and above COMPATIBLE_HOST_armv4 = 'null' |