* [meta-oe][PATCH 02/18] breakpad: Update to latest
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 03/18] ltrace: Fix a NULL string use Khem Raj
` (15 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
- Drop upstreamed ucontext_t patch
- basename is now available in musl
- Pin ARM-only ISA on armv5 and older arches
- Use COMPATIBLE_HOST instead of COMPATIBLE_MACHINE
- memory.h has been renamed to memory_allocator.h in latest breakpad
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...e-of-struct-ucontext-with-ucontext_t.patch | 242 ------------------
.../breakpad/0002-Avoid-using-basename.patch | 29 ---
.../0005-md2core-Replace-basename.patch | 38 ---
.../recipes-devtools/breakpad/breakpad_git.bb | 15 +-
4 files changed, 7 insertions(+), 317 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
delete mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
delete mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
deleted file mode 100644
index 07cb8a366e..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From b90c8f3b60bfe5dbed2823620242e9d30b9eb28f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 28 Jun 2017 19:01:18 -0700
-Subject: [PATCH] Replace use of struct ucontext with ucontext_t
-
-glibc 2.26 would not expose struct ucontext anymore
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++-----------
- .../linux/dump_writer_common/ucontext_reader.h | 14 +++++-----
- src/client/linux/handler/exception_handler.cc | 10 +++----
- src/client/linux/handler/exception_handler.h | 4 +--
- .../linux/microdump_writer/microdump_writer.cc | 2 +-
- .../linux/minidump_writer/minidump_writer.cc | 2 +-
- 6 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc
-index c80724dd..052ce37c 100644
---- a/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -36,19 +36,19 @@ namespace google_breakpad {
-
- // Minidump defines register structures which are different from the raw
- // structures which we get from the kernel. These are platform specific
--// functions to juggle the ucontext and user structures into minidump format.
-+// functions to juggle the ucontext_t and user structures into minidump format.
-
- #if defined(__i386__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_ESP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_EIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__x86_64)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RSP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__ARM_EABI__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->context_flags = MD_CONTEXT_ARM_FULL;
-
- out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-
- #elif defined(__aarch64__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs) {
- out->context_flags = MD_CONTEXT_ARM64_FULL;
-
-@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__mips__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
- out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h
-index b6e77b4b..2de80b70 100644
---- a/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -39,23 +39,23 @@
-
- namespace google_breakpad {
-
--// Wraps platform-dependent implementations of accessors to ucontext structs.
-+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
- struct UContextReader {
-- static uintptr_t GetStackPointer(const struct ucontext* uc);
-+ static uintptr_t GetStackPointer(const ucontext_t* uc);
-
-- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
-
-- // Juggle a arch-specific ucontext into a minidump format
-+ // Juggle a arch-specific ucontext_t into a minidump format
- // out: the minidump structure
- // info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
- #else
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
-
-diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
-index 586d84e9..05936d28 100644
---- a/src/client/linux/handler/exception_handler.cc
-+++ b/src/client/linux/handler/exception_handler.cc
-@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- // Fill in all the holes in the struct to make Valgrind happy.
- memset(&g_crash_context_, 0, sizeof(g_crash_context_));
- memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
-- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- struct fpsimd_context* fp_ptr =
- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
- if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
- memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
- sizeof(g_crash_context_.float_state));
-@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
- // ExceptionHandler::HandleSignal().
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
-- struct ucontext context;
-+ ucontext_t context;
- getcontext(&context);
- return HandleSignal(sig, &siginfo, &context);
- }
-diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h
-index daba57e0..25598a29 100644
---- a/src/client/linux/handler/exception_handler.h
-+++ b/src/client/linux/handler/exception_handler.h
-@@ -191,11 +191,11 @@ class ExceptionHandler {
- struct CrashContext {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
-- struct ucontext context;
-+ ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
-- // ucontext so 'float_state' is not required.
-+ // ucontext_t so 'float_state' is not required.
- fpstate_t float_state;
- #endif
- };
-diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc
-index 3764eec2..80ad5c46 100644
---- a/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -593,7 +593,7 @@ class MicrodumpWriter {
-
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
-- const struct ucontext* const ucontext_;
-+ const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc
-index d11ba6e5..c7161434 100644
---- a/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -1323,7 +1323,7 @@ class MinidumpWriter {
- const int fd_; // File descriptor where the minidum should be written.
- const char* path_; // Path to the file where the minidum should be written.
-
-- const struct ucontext* const ucontext_; // also from the signal handler
-+ const ucontext_t* const ucontext_; // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
---
-2.13.2
-
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
deleted file mode 100644
index bc62829811..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 806964f852773e427fea82a7716d44ce3be4498c Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sun, 1 Feb 2015 14:27:32 +0100
-Subject: [PATCH 2/3] Avoid using basename
-
----
- src/common/linux/dump_symbols.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc
-index d029ca14..6ac4a17b 100644
---- a/src/common/linux/dump_symbols.cc
-+++ b/src/common/linux/dump_symbols.cc
-@@ -881,9 +881,9 @@ const char* ElfArchitecture(const typename ElfClass::Ehdr* elf_header) {
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string &filename) {
- // Lots of copies! basename's behavior is less than ideal.
-- char* c_filename = strdup(filename.c_str());
-- string base = basename(c_filename);
-- free(c_filename);
-+ const char *c_filename = filename.c_str();
-+ const char *p = strrchr(c_filename, '/');
-+ string base = p ? p+1 : c_filename;
- return base;
- }
-
---
-2.14.1
-
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
deleted file mode 100644
index 852c1ed2ca..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bbf2b5ed5d93b227df8aea5726727b48e29f6790 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 14 Sep 2017 23:35:40 -0700
-Subject: [PATCH 5/5] md2core: Replace basename()
-
-musl does not provide it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/tools/linux/md2core/minidump-2-core.cc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
-index 6a9e28eb..52b81c22 100644
---- a/src/tools/linux/md2core/minidump-2-core.cc
-+++ b/src/tools/linux/md2core/minidump-2-core.cc
-@@ -107,6 +107,9 @@ struct Options {
-
- static void
- Usage(int argc, const char* argv[]) {
-+ const char *c_filename = argv[0];;
-+ const char *p = strrchr(c_filename, '/');
-+ const char *base = p ? p+1 : c_filename;
- fprintf(stderr,
- "Usage: %s [options] <minidump file>\n"
- "\n"
-@@ -133,7 +136,7 @@ Usage(int argc, const char* argv[]) {
- " lookups to be done in this directory rather than the filesystem\n"
- " layout as it exists in the crashing image. This path should end\n"
- " with a slash if it's a directory. e.g. /var/lib/breakpad/\n"
-- "", basename(argv[0]));
-+ "", base);
- }
-
- static void
---
-2.14.1
-
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
index d9773c9a6e..2bc0aacb0f 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
@@ -19,10 +19,11 @@ PV = "1.0+git${SRCPV}"
SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp"
-SRCREV_breakpad = "dea867e76f24e4a68395684b9d1cf24bcef82f20"
+SRCREV_breakpad = "5467393a3d1e7ab929fd01d79971701bf4e2c2c6"
+#v1.8.0
SRCREV_gtest = "ec44c6c1675c25b9827aacd08c02433cccde7780"
SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
-SRCREV_lss = "a91633d172407f6c83dd69af11510b37afebb7f9"
+SRCREV_lss = "a89bf7903f3169e6bc7b8efc10a73a7571de21cf"
SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770"
SRC_URI = "git://github.com/google/breakpad;name=breakpad \
@@ -30,15 +31,12 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
git://github.com/google/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \
git://chromium.googlesource.com/linux-syscall-support;protocol=https;destsuffix=git/src/third_party/lss;name=lss \
git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp \
- file://0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch \
file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \
- file://0002-Avoid-using-basename.patch \
file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \
file://0001-Turn-off-sign-compare-for-musl-libc.patch \
file://0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch \
file://0003-Dont-include-stab.h.patch \
file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \
- file://0005-md2core-Replace-basename.patch \
file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \
file://mcontext.patch \
file://0001-disable-calls-to-getcontext-with-musl.patch \
@@ -49,7 +47,7 @@ S = "${WORKDIR}/git"
CXXFLAGS += "-D_GNU_SOURCE"
-COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*"
+COMPATIBLE_HOST_powerpc = "null"
do_install_append() {
install -d ${D}${includedir}
@@ -72,7 +70,7 @@ do_install_append() {
install -m 0644 ${S}/src/client/linux/minidump_writer/minidump_writer.h ${D}${includedir}/breakpad/client/linux/minidump_writer/minidump_writer.h
install -d ${D}${includedir}/breakpad/common
- install -m 0644 ${S}/src/common/memory.h ${D}${includedir}/breakpad/common/memory.h
+ install -m 0644 ${S}/src/common/memory_allocator.h ${D}${includedir}/breakpad/common/memory_allocator.h
install -m 0644 ${S}/src/common/scoped_ptr.h ${D}${includedir}/breakpad/common/scoped_ptr.h
install -m 0644 ${S}/src/common/using_std_string.h ${D}${includedir}/breakpad/common/using_std_string.h
@@ -120,4 +118,5 @@ breakpad_populate_sysroot() {
#| {standard input}:2184: Error: Thumb does not support this addressing mode -- `str r6,[r1,#-4]!'
#| {standard input}:2191: Error: lo register required -- `ldr pc,[sp]'
#| make: *** [src/client/linux/handler/exception_handler.o] Error 1
-ARM_INSTRUCTION_SET = "arm"
+ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 03/18] ltrace: Fix a NULL string use
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 02/18] breakpad: Update to latest Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-networking][PATCH 04/18] opensaf: Upgrade to 5.18.09 Khem Raj
` (14 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
This case is likely to happen when mod == NULL so print it when
we are computing modname and symname
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...o-same-block-where-modname-and-symna.patch | 37 +++++++++++++++++++
meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch
new file mode 100644
index 0000000000..54acaace1a
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch
@@ -0,0 +1,37 @@
+From 0cad025f80cf090dc16a5b70e21477f5b08a67fd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 20 Dec 2018 11:27:45 -0800
+Subject: [PATCH] move fprintf into same block where modname and symname are
+ computed
+
+In its current state if mod turns out to be NULL then modname and
+symname will also turn out to be NULL and fprinting them as strings will
+be problematic
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ output.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/output.c b/output.c
+index b63befe..5aada7b 100644
+--- a/output.c
++++ b/output.c
+@@ -654,12 +654,11 @@ frame_callback (Dwfl_Frame *state, void *arg)
+ NULL, NULL, NULL);
+ symname = dwfl_module_addrinfo(mod, pc, &off, &sym,
+ NULL, NULL, NULL);
++ /* This mimics the output produced by libunwind below. */
++ fprintf(options.output, " > %s(%s+0x%" PRIx64 ") [%" PRIx64 "]\n",
++ modname, symname, off, pc);
+ }
+
+- /* This mimics the output produced by libunwind below. */
+- fprintf(options.output, " > %s(%s+0x%" PRIx64 ") [%" PRIx64 "]\n",
+- modname, symname, off, pc);
+-
+ /* See if we can extract the source line too and print it on
+ the next line if we can find it. */
+ if (mod != NULL) {
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index f4033f7c27..83043cd212 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -25,6 +25,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http
file://0001-Add-support-for-mips64-n32-n64.patch \
file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
file://0001-mips-plt.c-Delete-include-error.h.patch \
+ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
"
S = "${WORKDIR}/git"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-networking][PATCH 04/18] opensaf: Upgrade to 5.18.09
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 02/18] breakpad: Update to latest Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 03/18] ltrace: Fix a NULL string use Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 05/18] libgpiod: Rrecommend python3 only for PN-python package Khem Raj
` (13 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Degrade certain Werror into warnings to get it building with
gcc >= 8
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-Fix-string-overflow-in-snprintf.patch | 12 ++++++------
.../{opensaf_5.18.04.bb => opensaf_5.18.09.bb} | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
rename meta-networking/recipes-daemons/opensaf/{opensaf_5.18.04.bb => opensaf_5.18.09.bb} (90%)
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch
index db6796d05d..93c75777fe 100644
--- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch
+++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch
@@ -1,4 +1,4 @@
-From ae7178a78aba2e5766b70191617113487fd7ad0b Mon Sep 17 00:00:00 2001
+From 88661a60629894353512c53ed32f2b901f64149c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Apr 2018 18:29:17 -0700
Subject: [PATCH] Fix string overflow in snprintf
@@ -53,7 +53,7 @@ index 81e521e..d53cc48 100644
TRACE_ENTER();
diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc
-index 45cdce8..6761bcf 100644
+index c30ea14..098f17a 100644
--- a/src/smf/smfd/SmfUpgradeCampaign.cc
+++ b/src/smf/smfd/SmfUpgradeCampaign.cc
@@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
@@ -66,11 +66,11 @@ index 45cdce8..6761bcf 100644
/* Read the SmfCampRestartInfo object smfCampRestartCnt attr */
std::string obj = "smfRestartInfo=info," +
@@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
- attrsmfCampRestartCnt.setName("smfCampRestartCnt");
- attrsmfCampRestartCnt.setType("SA_IMM_ATTR_SAUINT32T");
+ attrsmfCampRestartCnt.SetAttributeName("smfCampRestartCnt");
+ attrsmfCampRestartCnt.SetAttributeType("SA_IMM_ATTR_SAUINT32T");
char buf[5];
- snprintf(buf, 4, "%d", curCnt);
+ snprintf(buf, 4, "%hd", curCnt);
- attrsmfCampRestartCnt.addValue(buf);
- imoCampRestartInfo.addValue(attrsmfCampRestartCnt);
+ attrsmfCampRestartCnt.AddAttributeValue(buf);
+ imoCampRestartInfo.AddValue(attrsmfCampRestartCnt);
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb
similarity index 90%
rename from meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb
rename to meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb
index c534c6206b..f1aedc4def 100644
--- a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb
+++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb
@@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
file://0001-Fix-string-overflow-in-snprintf.patch \
file://0008-check-for-size-before-using-strncpy.patch \
"
-SRC_URI[md5sum] = "21836e43b13ad33bed9bd0ed391e5a6e"
-SRC_URI[sha256sum] = "e55dc2645487fb22938e8386b99eef6eb7aff43a246ce3e92488daf6ee46247a"
+SRC_URI[md5sum] = "45044fde0b35eac057a5fa05c27b8040"
+SRC_URI[sha256sum] = "230a0ea628ba278170a913746c39b2c8cd529d7dc25326b2e17b5c095cf94025"
inherit autotools useradd systemd pkgconfig
@@ -48,7 +48,8 @@ PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
PKGLIBDIR="${libdir}"
-
+CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation"
+CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation="
LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed"
do_install_append() {
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 05/18] libgpiod: Rrecommend python3 only for PN-python package
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (2 preceding siblings ...)
2018-12-23 21:35 ` [meta-networking][PATCH 04/18] opensaf: Upgrade to 5.18.09 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 06/18] srecord: GPL-3.0 and LGPL-3.0 is correct license Khem Raj
` (12 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Fixes overdependency on PN
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/libgpiod/libgpiod_1.2.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.2.bb
index 30289b983b..dd080ff9d2 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.2.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.2.bb
@@ -7,10 +7,10 @@ SRC_URI[sha256sum] = "b6b9079c933f7c8524815437937dda6b795a16141bca202a9eec70ba58
PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx"
-PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3,python3-core"
+PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,"
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}
PACKAGES =+ "${PN}-python"
FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}"
-RRECOMMENDS_${PN} += "${RRECOMMENDS_PYTHON}"
+RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 06/18] srecord: GPL-3.0 and LGPL-3.0 is correct license
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (3 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 05/18] libgpiod: Rrecommend python3 only for PN-python package Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 07/18] ttf-droid: Delete from staging install area instead of sources Khem Raj
` (11 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/srecord/srecord_1.64.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-oe/recipes-support/srecord/srecord_1.64.bb
index fe1af476f2..d3488df2cf 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.64.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.64.bb
@@ -1,6 +1,6 @@
SUMMARY = "A collection of powerful tools for manipulating EPROM load files."
SECTION = "devel"
-LICENSE = "GPLv2"
+LICENSE = "GPLv3+ & LGPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7"
SRC_URI = " \
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 07/18] ttf-droid: Delete from staging install area instead of sources
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (4 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 06/18] srecord: GPL-3.0 and LGPL-3.0 is correct license Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 08/18] lio-utils: Switch SRC_URI to use datera mirror on github Khem Raj
` (10 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
* This leaves the sourcedir unmodified
* Add -f option to rm to not fail if file is not there
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index e62badf778..8dba7ee6fa 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
@@ -12,8 +12,12 @@ SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master"
S = "${WORKDIR}/git/data/fonts"
-do_install_prepend() {
- rm ${S}/Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf DroidSansFallbackLegacy.ttf # we're not packaging it
+do_install_append() {
+ for f in Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf \
+ Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf \
+ DroidSansFallbackLegacy.ttf; do
+ rm -f ${D}${datadir}/fonts/truetype/$f
+ done
}
PACKAGES = "ttf-droid-sans ttf-droid-sans-mono \
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 08/18] lio-utils: Switch SRC_URI to use datera mirror on github
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (5 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 07/18] ttf-droid: Delete from staging install area instead of sources Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 09/18] breakpad: Fix build with gcc9 on x86 Khem Raj
` (9 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
index d9780cfb4c..ea54e75523 100644
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df
PV = "4.1+git${SRCPV}"
-SRC_URI = "git://risingtidesystems.com/lio-utils.git \
+SRC_URI = "git://github.com/Datera/lio-utils.git \
file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
"
-SRCREV = "28bd928655bdc7bd3cf380f0196630690c51e05f"
+SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
S = "${WORKDIR}/git"
inherit distutils
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 09/18] breakpad: Fix build with gcc9 on x86
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (6 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 08/18] lio-utils: Switch SRC_URI to use datera mirror on github Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-networking][PATCH 10/18] miniupnpd: Fix cross compile on OE Khem Raj
` (8 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../breakpad/breakpad/dont-clobber-rsp.patch | 30 +++++++++++++++++++
.../recipes-devtools/breakpad/breakpad_git.bb | 1 +
2 files changed, 31 insertions(+)
create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch b/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch
new file mode 100644
index 0000000000..b1c37fc8e9
--- /dev/null
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch
@@ -0,0 +1,30 @@
+Do not add stack pointer to clobber list
+
+it was being ignored until gcc 9.0 became capable
+of flagging this silent ignoring via [1]
+
+[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste>
+
+Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/src/third_party/lss/linux_syscall_support.h
++++ b/src/third_party/lss/linux_syscall_support.h
+@@ -1966,7 +1966,7 @@ struct kernel_statfs {
+ __asm__ volatile(LSS_ENTRYPOINT \
+ : "=a" (__res) \
+ : "0" (__NR_##name) \
+- : "esp", "memory"); \
++ : "memory"); \
+ LSS_RETURN(type,__res); \
+ }
+ #undef _syscall1
+@@ -2407,7 +2407,7 @@ struct kernel_statfs {
+ "d"(LSS_SYSCALL_ARG(parent_tidptr)),
+ "r"(LSS_SYSCALL_ARG(newtls)),
+ "r"(LSS_SYSCALL_ARG(child_tidptr))
+- : "rsp", "memory", "r8", "r10", "r11", "rcx");
++ : "memory", "r8", "r10", "r11", "rcx");
+ }
+ LSS_RETURN(int, __res);
+ }
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
index 2bc0aacb0f..528c237564 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
@@ -42,6 +42,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
file://0001-disable-calls-to-getcontext-with-musl.patch \
file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
+ file://dont-clobber-rsp.patch \
"
S = "${WORKDIR}/git"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-networking][PATCH 10/18] miniupnpd: Fix cross compile on OE
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (7 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 09/18] breakpad: Fix build with gcc9 on x86 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 11/18] open-vm-tools: Upgrade to 10.3.5 Khem Raj
` (7 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
genconfig script can be specified OS specs
if its not then it pokes at the build system
via uname, we add code for OE support to ensure
we pass DISTRO_VERSION as OS_VERSION
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...-Add-OpenEmbedded-cross-compile-case.patch | 40 +++++++++++++++++++
.../miniupnpd/miniupnpd_2.1.20180706.bb | 8 +++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
new file mode 100644
index 0000000000..cd4291d91b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
@@ -0,0 +1,40 @@
+From 54698856e5602bbd9d61e855814c854a013b4840 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Dec 2018 18:47:45 -0800
+Subject: [PATCH] Add OpenEmbedded cross compile case
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ genconfig.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/genconfig.sh b/genconfig.sh
+index dc42462..59922e9 100755
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then
+ OS_VERSION="Tomato $TOMATO_VER"
+ fi
+
++# OpenEmbedded special case
++if [ -f ./os.openembedded ]; then
++ OS_NAME=OpenEmbedded
++ OS_VERSION=$(cat ./os.openembedded)
++fi
++
+ ${RM} ${CONFIGFILE}
+
+ echo "/* MiniUPnP Project" >> ${CONFIGFILE}
+@@ -318,6 +324,11 @@ case $OS_NAME in
+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+ FW=netfilter
+ ;;
++ OpenEmbedded)
++ OS_URL=http://www.openembedded.org/
++ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
++ FW=netfilter
++ ;;
+ AstLinux)
+ OS_URL=http://www.astlinux.org/
+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb
index d5d9bcf64a..ff40daaac9 100644
--- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb
+++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb
@@ -12,12 +12,18 @@ inherit autotools gettext pkgconfig systemd
DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack"
SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \
- file://miniupnpd.service"
+ file://miniupnpd.service \
+ file://0001-Add-OpenEmbedded-cross-compile-case.patch \
+ "
SRC_URI[md5sum] = "a84b3647c871802abeccfc2771e8db21"
SRC_URI[sha256sum] = "fc2d2fd044d8c3f8d02b63d70489bb35ece836a4fc1b6386865ac8fbe8d8b006"
IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}"
+do_configure_prepend() {
+ echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded
+}
+
do_compile() {
cd ${S}
CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 11/18] open-vm-tools: Upgrade to 10.3.5
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (8 preceding siblings ...)
2018-12-23 21:35 ` [meta-networking][PATCH 10/18] miniupnpd: Fix cross compile on OE Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-multimedia][PATCH 12/18] tvheadend: Add dependency on dvb-apps Khem Raj
` (6 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Add a patch to fix build with gcc9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...c-Do-not-print-NULL-string-into-logs.patch | 31 ++++++++++++++++
...ools_10.3.0.bb => open-vm-tools_10.3.5.bb} | 36 ++++++++++---------
2 files changed, 50 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-misc-Do-not-print-NULL-string-into-logs.patch
rename meta-oe/recipes-support/open-vm-tools/{open-vm-tools_10.3.0.bb => open-vm-tools_10.3.5.bb} (76%)
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-misc-Do-not-print-NULL-string-into-logs.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-misc-Do-not-print-NULL-string-into-logs.patch
new file mode 100644
index 0000000000..7af265a999
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-misc-Do-not-print-NULL-string-into-logs.patch
@@ -0,0 +1,31 @@
+From e25d00d8297cba044c3a4d2e38749e54adac66c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Dec 2018 19:59:02 -0800
+Subject: [PATCH] misc: Do not print NULL string into logs
+
+string format %s is getting a NULL pointer for 'expand'
+parameter always since the check for chunks[i] == NULL will ensure that
+its always null when the Log() API is called
+
+Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ open-vm-tools/lib/misc/util_misc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git open-vm-tools/lib/misc/util_misc.c b/open-vm-tools/lib/misc/util_misc.c
+index 198c23d2..0ac0a335 100644
+--- open-vm-tools/lib/misc/util_misc.c
++++ open-vm-tools/lib/misc/util_misc.c
+@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN file path to expand
+ ASSERT(!freeChunk[i]);
+ chunks[i] = expand;
+ if (chunks[i] == NULL) {
+- Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
+- __FUNCTION__, expand, fileName);
++ Log("%s: Cannot allocate memory to expand in \"%s\".\n",
++ __FUNCTION__, fileName);
+ goto out;
+ }
+ chunkSize[i] = strlen(expand);
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb
similarity index 76%
rename from meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb
rename to meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb
index 2d7486da34..7ed6593727 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb
@@ -22,23 +22,25 @@ LICENSE_modules/linux = "GPL-2.0"
LICENSE_modules/solaris = "CDDL-1.0"
SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
- file://tools.conf \
- file://vmtoolsd.service \
- file://vmtoolsd.init \
- file://0001-configure.ac-don-t-use-dnet-config.patch \
- file://0002-add-include-sys-sysmacros.h.patch \
- file://0005-Use-configure-test-for-struct-timespec.patch \
- file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \
- file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \
- file://0011-Use-configure-test-for-sys-stat.h-include.patch \
- file://fix-subdir-objects-configure-error.patch \
- file://0001-include-poll.h-instead-of-sys-poll.h.patch \
- file://0002-Rename-poll.h-to-vm_poll.h.patch \
- file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \
- file://0004-Use-uintmax_t-for-handling-rlim_t.patch \
- file://0001-Use-off64_t-instead-of-__off64_t.patch \
-"
-SRCREV = "2147df6aabe639fc5ff423ed791a8e7f02bf8d0a"
+ file://tools.conf \
+ file://vmtoolsd.service \
+ file://vmtoolsd.init \
+ file://0001-configure.ac-don-t-use-dnet-config.patch \
+ file://0002-add-include-sys-sysmacros.h.patch \
+ file://0005-Use-configure-test-for-struct-timespec.patch \
+ file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \
+ file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \
+ file://0011-Use-configure-test-for-sys-stat.h-include.patch \
+ file://fix-subdir-objects-configure-error.patch \
+ file://0001-include-poll.h-instead-of-sys-poll.h.patch \
+ file://0002-Rename-poll.h-to-vm_poll.h.patch \
+ file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \
+ file://0004-Use-uintmax_t-for-handling-rlim_t.patch \
+ file://0001-Use-off64_t-instead-of-__off64_t.patch \
+ file://0001-misc-Do-not-print-NULL-string-into-logs.patch \
+ "
+# stable-10.3.5
+SRCREV = "f2ff192717375b95a6b7e278fb47dbb3d3bc56d1"
S = "${WORKDIR}/git/open-vm-tools"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-multimedia][PATCH 12/18] tvheadend: Add dependency on dvb-apps
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (9 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 11/18] open-vm-tools: Upgrade to 10.3.5 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 13/18] mozjs: Remove -Werror=format from CXXFLAGS Khem Raj
` (5 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Fixed errors like
ERROR: Failed to fetch dvb-scan data (use --disable-dvbscan)
NOTE: The following config.log files may provide further information.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
index 95cf10bf6c..dc6cd46b0a 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://tvheadend.org/"
inherit autotools-brokensep gettext gitpkgv pkgconfig
-DEPENDS = "avahi cmake-native libdvbcsa libpcre2 openssl uriparser zlib"
+DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl uriparser zlib"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 13/18] mozjs: Remove -Werror=format from CXXFLAGS
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (10 preceding siblings ...)
2018-12-23 21:35 ` [meta-multimedia][PATCH 12/18] tvheadend: Add dependency on dvb-apps Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-python][PATCH 14/18] python-msgpack: Upgrade to 0.6.0 Khem Raj
` (4 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
This is to make way for gcc9 since it spews some extra warnings
which need to be eventually fixed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../mozjs/mozjs/format-overflow.patch | 21 +++++++++++++++++++
.../recipes-extended/mozjs/mozjs_52.9.1.bb | 1 +
2 files changed, 22 insertions(+)
create mode 100644 meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch b/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch
new file mode 100644
index 0000000000..29c6a7b69c
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch
@@ -0,0 +1,21 @@
+Drop enable format string warnings to help gcc9
+
+Fixes
+| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/mozjs/52.9.1-r0/mozjs-52.9.1/js/src/jit/x64/BaseAssembler-x64.h:596:13: error: '%s' directive argument is null [-Werror=format-overflow=]
+| 596 | spew("movq " MEM_obs ", %s", ADDR_obs(offset, base, index, scale), GPReg64Name(dst));
+| | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Inappropriate [Workaround for gcc9]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/js/src/moz.build
++++ b/js/src/moz.build
+@@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']:
+ DEFINES['FFI_BUILDING'] = True
+
+ if CONFIG['GNU_CXX']:
+- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
++ CXXFLAGS += ['-Wno-shadow']
+
+ # Suppress warnings in third-party code.
+ if CONFIG['CLANG_CXX']:
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
index 440a25b74e..a28ecc57d6 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.o
file://disable-mozglue-in-stand-alone-builds.patch \
file://add-riscv-support.patch \
file://0001-mozjs-fix-coredump-caused-by-getenv.patch \
+ file://format-overflow.patch \
"
SRC_URI_append_libc-musl = " \
file://0006-support-musl.patch \
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-python][PATCH 14/18] python-msgpack: Upgrade to 0.6.0
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (11 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 13/18] mozjs: Remove -Werror=format from CXXFLAGS Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-python][PATCH 15/18] python-grpcio: Upgrade to 1.17.1 Khem Raj
` (3 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Set PYPI_PACKAGE to msgpack since python-msgpack is deprecated
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Tim "moto-timo" Orling <TicoTimo@gmail.com>
Cc: Derek Straka <derek@asterius.io>
---
meta-python/recipes-devtools/python/python-msgpack.inc | 8 ++++----
.../{python-msgpack_0.5.6.bb => python-msgpack_0.6.0.bb} | 0
...{python3-msgpack_0.5.6.bb => python3-msgpack_0.6.0.bb} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta-python/recipes-devtools/python/{python-msgpack_0.5.6.bb => python-msgpack_0.6.0.bb} (100%)
rename meta-python/recipes-devtools/python/{python3-msgpack_0.5.6.bb => python3-msgpack_0.6.0.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python-msgpack.inc b/meta-python/recipes-devtools/python/python-msgpack.inc
index fdc8926104..9147c06326 100644
--- a/meta-python/recipes-devtools/python/python-msgpack.inc
+++ b/meta-python/recipes-devtools/python/python-msgpack.inc
@@ -2,12 +2,12 @@ SUMMARY = "MessagePack (de)serializer"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751"
-SRC_URI[md5sum] = "6d644c06a87a5a111bbbf5b34b4be440"
-SRC_URI[sha256sum] = "378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b"
-
-PYPI_PACKAGE = "msgpack-python"
+PYPI_PACKAGE = "msgpack"
inherit pypi
+SRC_URI[md5sum] = "be3043cc2c1e3b5ebf08463ffa71cf17"
+SRC_URI[sha256sum] = "64abc6bf3a2ac301702f5760f4e6e227d0fd4d84d9014ef9a40faa9d43365259"
+
RDEPENDS_${PN}_class-target += "\
${PYTHON_PN}-io \
"
diff --git a/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb b/meta-python/recipes-devtools/python/python-msgpack_0.6.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb
rename to meta-python/recipes-devtools/python/python-msgpack_0.6.0.bb
diff --git a/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb b/meta-python/recipes-devtools/python/python3-msgpack_0.6.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb
rename to meta-python/recipes-devtools/python/python3-msgpack_0.6.0.bb
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-python][PATCH 15/18] python-grpcio: Upgrade to 1.17.1
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (12 preceding siblings ...)
2018-12-23 21:35 ` [meta-python][PATCH 14/18] python-msgpack: Upgrade to 0.6.0 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-python][PATCH 16/18] python-pyflame: Upgrade to 1.6.7 Khem Raj
` (2 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Patch to fix ppc build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Tim "moto-timo" Orling <TicoTimo@gmail.com>
Cc: Derek Straka <derek@asterius.io>
---
.../recipes-devtools/python/python-grpcio.inc | 10 ++++++----
.../python-grpcio/ppc-boringssl-support.patch | 17 +++++++++++++++++
...grpcio_1.14.1.bb => python-grpcio_1.17.1.bb} | 0
...rpcio_1.14.1.bb => python3-grpcio_1.17.1.bb} | 0
4 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch
rename meta-python/recipes-devtools/python/{python-grpcio_1.14.1.bb => python-grpcio_1.17.1.bb} (100%)
rename meta-python/recipes-devtools/python/{python3-grpcio_1.14.1.bb => python3-grpcio_1.17.1.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-python/recipes-devtools/python/python-grpcio.inc
index 23d25f7aa5..0cef0dda02 100644
--- a/meta-python/recipes-devtools/python/python-grpcio.inc
+++ b/meta-python/recipes-devtools/python/python-grpcio.inc
@@ -5,7 +5,10 @@ SECTION = "devel/python"
DEPENDS_append = "${PYTHON_PN}-protobuf"
FILESEXTRAPATHS_prepend := "${THISDIR}/python-grpcio:"
-SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch "
+
+SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
+ file://ppc-boringssl-support.patch \
+"
RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \
${PYTHON_PN}-setuptools \
@@ -16,9 +19,8 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
inherit pypi
-
-SRC_URI[md5sum] = "0987ae2e47b5103de3cacc437874a3c5"
-SRC_URI[sha256sum] = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05"
+SRC_URI[md5sum] = "dd46d7270dfce713c03f45fae999cae3"
+SRC_URI[sha256sum] = "fd6774bbb6c717f725b39394757445ead4f69c471118364933aadb81a4f16961"
CLEANBROKEN = "1"
diff --git a/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch
new file mode 100644
index 0000000000..6435abbe6d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch
@@ -0,0 +1,17 @@
+Let boringSSL compile on ppc32 bit
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/third_party/boringssl/include/openssl/base.h
++++ b/third_party/boringssl/include/openssl/base.h
+@@ -95,6 +95,9 @@ extern "C" {
+ #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN)
+ #define OPENSSL_64_BIT
+ #define OPENSSL_PPC64LE
++#elif (defined(__PPC__) || defined(__powerpc__))
++#define OPENSSL_32_BIT
++#define OPENSSL_PPC
+ #elif defined(__mips__) && !defined(__LP64__)
+ #define OPENSSL_32_BIT
+ #define OPENSSL_MIPS
diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.14.1.bb b/meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-grpcio_1.14.1.bb
rename to meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.14.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.14.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-python][PATCH 16/18] python-pyflame: Upgrade to 1.6.7
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (13 preceding siblings ...)
2018-12-23 21:35 ` [meta-python][PATCH 15/18] python-grpcio: Upgrade to 1.17.1 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:45 ` Andrew Jeffery
2018-12-23 21:35 ` [meta-oe][PATCH 17/18] redis: Update to 4.0.12 Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 18/18] android-tools: Disable for powerpc/powerpc64 Khem Raj
16 siblings, 1 reply; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Disable build on ppc as well
Drop already upstreamed patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Tim "moto-timo" Orling <TicoTimo@gmail.com>
Cc: Derek Straka <derek@asterius.io>
---
...over-user_regs_struct-name-which-dif.patch | 69 ---------
...Account-for-prelinked-shared-objects.patch | 134 ------------------
.../python/python-pyflame.inc | 3 +-
.../python/python-pyflame_1.6.6.bb | 6 -
.../python/python-pyflame_1.6.7.bb | 4 +
5 files changed, 6 insertions(+), 210 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
delete mode 100644 meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch
delete mode 100644 meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
create mode 100644 meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
diff --git a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch b/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
deleted file mode 100644
index 09c4394c2a..0000000000
--- a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2ef124e235a47dd4742813cf80e11a89cf4f02f8 Mon Sep 17 00:00:00 2001
-From: Andrew Jeffery <andrew@aj.id.au>
-Date: Thu, 3 May 2018 12:35:31 +0930
-Subject: [PATCH] ptrace: Abstract over user_regs_struct name, which differs on
- ARM32
-
-Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
----
- src/ptrace.cc | 6 +++---
- src/ptrace.h | 10 ++++++++--
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/src/ptrace.cc b/src/ptrace.cc
-index 485f58e4d82e..610fabb3b8e8 100644
---- a/src/ptrace.cc
-+++ b/src/ptrace.cc
-@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) {
- DoWait(pid);
- }
-
--struct user_regs_struct PtraceGetRegs(pid_t pid) {
-- struct user_regs_struct regs;
-+user_regs_struct PtraceGetRegs(pid_t pid) {
-+ user_regs_struct regs;
- if (ptrace(PTRACE_GETREGS, pid, 0, ®s)) {
- std::ostringstream ss;
- ss << "Failed to PTRACE_GETREGS: " << strerror(errno);
-@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) {
- return regs;
- }
-
--void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) {
-+void PtraceSetRegs(pid_t pid, user_regs_struct regs) {
- if (ptrace(PTRACE_SETREGS, pid, 0, ®s)) {
- std::ostringstream ss;
- ss << "Failed to PTRACE_SETREGS: " << strerror(errno);
-diff --git a/src/ptrace.h b/src/ptrace.h
-index 7083be1c4dfd..d6af8bf9f83a 100644
---- a/src/ptrace.h
-+++ b/src/ptrace.h
-@@ -23,6 +23,12 @@
-
- #include "./config.h"
-
-+#if defined(__arm__)
-+typedef struct user_regs user_regs_struct;
-+#else
-+typedef struct user_regs_struct user_regs_struct;
-+#endif
-+
- namespace pyflame {
-
- int DoWait(pid_t pid, int options = 0);
-@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid);
- void PtraceInterrupt(pid_t pid);
-
- // get regs from a process
--struct user_regs_struct PtraceGetRegs(pid_t pid);
-+user_regs_struct PtraceGetRegs(pid_t pid);
-
- // set regs in a process
--void PtraceSetRegs(pid_t pid, struct user_regs_struct regs);
-+void PtraceSetRegs(pid_t pid, user_regs_struct regs);
-
- // poke a long word into an address
- void PtracePoke(pid_t pid, unsigned long addr, long data);
---
-2.14.1
-
diff --git a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch b/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch
deleted file mode 100644
index 3eefc9cb98..0000000000
--- a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 007965d341349679607699d005c4af811b2c419a Mon Sep 17 00:00:00 2001
-From: Andrew Jeffery <andrew@aj.id.au>
-Date: Fri, 4 May 2018 11:23:53 +0930
-Subject: [PATCH] symbol: Account for prelinked shared objects
-
-Some projects, such as those derived from Yocto, tend to prelink their
-binaries and libraries to reduce runtime overhead. Currently this trips
-up pyflame in its symbol address calculations, and leads to ptrace
-failures due to spurious addresses:
-
- $ pyflame -t python -c "print 'foo'"
- Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482, addr 0x9f9b1d70): Input/output error
- Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482, addr 0x9f9b1d70): Input/output error
- Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482, addr 0x9f9b1d70): Input/output error
- Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482, addr 0x9f9b1d70): Input/output error
- Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482, addr 0x9f9b1d70): Input/output error
- ...
-
-Add support for reading a prelinked base p_vaddr out of the ELF and
-adjust the PyAddresses values accordingly.
-
-Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
----
- src/symbol.cc | 15 +++++++++++++++
- src/symbol.h | 29 ++++++++++++++++++++++++++++-
- 2 files changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/src/symbol.cc b/src/symbol.cc
-index 125174efeeb5..39c3e8132dd1 100644
---- a/src/symbol.cc
-+++ b/src/symbol.cc
-@@ -166,6 +166,17 @@ PyABI ELF::WalkTable(int sym, int str, PyAddresses *addrs) {
- return abi;
- }
-
-+addr_t ELF::GetBaseAddress() {
-+ int32_t phnum = hdr()->e_phnum;
-+ int32_t i;
-+ for (i = 0; i < phnum && phdr(i)->p_type != PT_LOAD; i++) {
-+ }
-+ if (i == phnum) {
-+ throw FatalException("Failed to find PT_LOAD entry in program headers");
-+ }
-+ return phdr(i)->p_vaddr;
-+}
-+
- PyAddresses ELF::GetAddresses(PyABI *abi) {
- PyAddresses addrs;
- PyABI detected_abi = WalkTable(dynsym_, dynstr_, &addrs);
-@@ -176,6 +187,10 @@ PyAddresses ELF::GetAddresses(PyABI *abi) {
- if (abi != nullptr) {
- *abi = detected_abi;
- }
-+ // Handle prelinked shared objects
-+ if (hdr()->e_type == ET_DYN) {
-+ return addrs - GetBaseAddress();
-+ }
- return addrs;
- }
- } // namespace pyflame
-diff --git a/src/symbol.h b/src/symbol.h
-index 124853bcc1c1..bb92b9a2604b 100644
---- a/src/symbol.h
-+++ b/src/symbol.h
-@@ -28,15 +28,19 @@
-
- #if USE_ELF64
- #define ehdr_t Elf64_Ehdr
-+#define phdr_t Elf64_Phdr
- #define shdr_t Elf64_Shdr
- #define dyn_t Elf64_Dyn
- #define sym_t Elf64_Sym
-+#define addr_t Elf64_Addr
- #define ARCH_ELFCLASS ELFCLASS64
- #else
- #define ehdr_t Elf32_Ehdr
-+#define phdr_t Elf32_Phdr
- #define shdr_t Elf32_Shdr
- #define dyn_t Elf32_Dyn
- #define sym_t Elf32_Sym
-+#define addr_t Elf32_Addr
- #define ARCH_ELFCLASS ELFCLASS32
- #endif
-
-@@ -67,8 +71,18 @@ struct PyAddresses {
- interp_head_hint(0),
- pie(false) {}
-
-+ PyAddresses operator-(const unsigned long base) const {
-+ PyAddresses res(*this);
-+ res.tstate_addr = this->tstate_addr == 0 ? 0 : this->tstate_addr - base;
-+ res.interp_head_addr =
-+ this->interp_head_addr == 0 ? 0 : this->interp_head_addr - base;
-+ res.interp_head_fn_addr =
-+ this->interp_head_fn_addr == 0 ? 0 : this->interp_head_fn_addr - base;
-+ return res;
-+ }
-+
- PyAddresses operator+(const unsigned long base) const {
-- PyAddresses res;
-+ PyAddresses res(*this);
- res.tstate_addr = this->tstate_addr == 0 ? 0 : this->tstate_addr + base;
- res.interp_head_addr =
- this->interp_head_addr == 0 ? 0 : this->interp_head_addr + base;
-@@ -113,6 +127,9 @@ class ELF {
- // ABI.
- PyAddresses GetAddresses(PyABI *abi);
-
-+ // Extract the base load address from the Program Header table
-+ addr_t GetBaseAddress();
-+
- private:
- void *addr_;
- size_t length_;
-@@ -122,6 +139,16 @@ class ELF {
- return reinterpret_cast<const ehdr_t *>(addr_);
- }
-
-+ inline const phdr_t *phdr(int idx) const {
-+ if (idx < 0) {
-+ std::ostringstream ss;
-+ ss << "Illegal phdr index: " << idx;
-+ throw FatalException(ss.str());
-+ }
-+ return reinterpret_cast<const phdr_t *>(p() + hdr()->e_phoff +
-+ idx * hdr()->e_phentsize);
-+ }
-+
- inline const shdr_t *shdr(int idx) const {
- if (idx < 0) {
- std::ostringstream ss;
---
-2.14.1
-
diff --git a/meta-python/recipes-devtools/python/python-pyflame.inc b/meta-python/recipes-devtools/python/python-pyflame.inc
index 340aab74ef..b3b153c57b 100644
--- a/meta-python/recipes-devtools/python/python-pyflame.inc
+++ b/meta-python/recipes-devtools/python/python-pyflame.inc
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
DEPENDS = "python"
-SRC_URI = "git://github.com/uber/pyflame.git;protocol=https"
+SRC_URI = "git://github.com/uber/pyflame.git;protocol=https;nobranch=1"
S = "${WORKDIR}/git"
inherit pkgconfig autotools
@@ -13,3 +13,4 @@ inherit pkgconfig autotools
COMPATIBLE_HOST_libc-musl_class-target = "null"
COMPATIBLE_HOST_mipsarch_class-target = "null"
COMPATIBLE_HOST_aarch64_class-target = "null"
+COMPATIBLE_HOST_powerpc_class-target = "null"
diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
deleted file mode 100644
index 8dedb89286..0000000000
--- a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require python-pyflame.inc
-
-# v1.6.6
-SRCREV = "8a9d8c2acc3b3bb027475b738134f1e6fff14e6c"
-SRC_URI += "file://0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch"
-SRC_URI += "file://0001-symbol-Account-for-prelinked-shared-objects.patch"
diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb b/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
new file mode 100644
index 0000000000..cb08f30a67
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
@@ -0,0 +1,4 @@
+require python-pyflame.inc
+
+# v1.6.7
+SRCREV = "c151d2f34737f28a1f5266a003b2b0720bbd9f96"
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [meta-python][PATCH 16/18] python-pyflame: Upgrade to 1.6.7
2018-12-23 21:35 ` [meta-python][PATCH 16/18] python-pyflame: Upgrade to 1.6.7 Khem Raj
@ 2018-12-23 21:45 ` Andrew Jeffery
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2018-12-23 21:45 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
On Mon, 24 Dec 2018, at 08:05, Khem Raj wrote:
> Disable build on ppc as well
> Drop already upstreamed patches
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> Cc: Tim "moto-timo" Orling <TicoTimo@gmail.com>
> Cc: Derek Straka <derek@asterius.io>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Thanks Khem!
> ---
> ...over-user_regs_struct-name-which-dif.patch | 69 ---------
> ...Account-for-prelinked-shared-objects.patch | 134 ------------------
> .../python/python-pyflame.inc | 3 +-
> .../python/python-pyflame_1.6.6.bb | 6 -
> .../python/python-pyflame_1.6.7.bb | 4 +
> 5 files changed, 6 insertions(+), 210 deletions(-)
> delete mode 100644 meta-python/recipes-devtools/python/python-
> pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-
> dif.patch
> delete mode 100644 meta-python/recipes-devtools/python/python-
> pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch
> delete mode 100644 meta-python/recipes-devtools/python/python-
> pyflame_1.6.6.bb
> create mode 100644 meta-python/recipes-devtools/python/python-
> pyflame_1.6.7.bb
>
> diff --git a/meta-python/recipes-devtools/python/python-
> pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-
> dif.patch b/meta-python/recipes-devtools/python/python-
> pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-
> dif.patch
> deleted file mode 100644
> index 09c4394c2a..0000000000
> --- a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-
> ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From 2ef124e235a47dd4742813cf80e11a89cf4f02f8 Mon Sep 17 00:00:00 2001
> -From: Andrew Jeffery <andrew@aj.id.au>
> -Date: Thu, 3 May 2018 12:35:31 +0930
> -Subject: [PATCH] ptrace: Abstract over user_regs_struct name, which
> differs on
> - ARM32
> -
> -Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ----
> - src/ptrace.cc | 6 +++---
> - src/ptrace.h | 10 ++++++++--
> - 2 files changed, 11 insertions(+), 5 deletions(-)
> -
> -diff --git a/src/ptrace.cc b/src/ptrace.cc
> -index 485f58e4d82e..610fabb3b8e8 100644
> ---- a/src/ptrace.cc
> -+++ b/src/ptrace.cc
> -@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) {
> - DoWait(pid);
> - }
> -
> --struct user_regs_struct PtraceGetRegs(pid_t pid) {
> -- struct user_regs_struct regs;
> -+user_regs_struct PtraceGetRegs(pid_t pid) {
> -+ user_regs_struct regs;
> - if (ptrace(PTRACE_GETREGS, pid, 0, ®s)) {
> - std::ostringstream ss;
> - ss << "Failed to PTRACE_GETREGS: " << strerror(errno);
> -@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) {
> - return regs;
> - }
> -
> --void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) {
> -+void PtraceSetRegs(pid_t pid, user_regs_struct regs) {
> - if (ptrace(PTRACE_SETREGS, pid, 0, ®s)) {
> - std::ostringstream ss;
> - ss << "Failed to PTRACE_SETREGS: " << strerror(errno);
> -diff --git a/src/ptrace.h b/src/ptrace.h
> -index 7083be1c4dfd..d6af8bf9f83a 100644
> ---- a/src/ptrace.h
> -+++ b/src/ptrace.h
> -@@ -23,6 +23,12 @@
> -
> - #include "./config.h"
> -
> -+#if defined(__arm__)
> -+typedef struct user_regs user_regs_struct;
> -+#else
> -+typedef struct user_regs_struct user_regs_struct;
> -+#endif
> -+
> - namespace pyflame {
> -
> - int DoWait(pid_t pid, int options = 0);
> -@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid);
> - void PtraceInterrupt(pid_t pid);
> -
> - // get regs from a process
> --struct user_regs_struct PtraceGetRegs(pid_t pid);
> -+user_regs_struct PtraceGetRegs(pid_t pid);
> -
> - // set regs in a process
> --void PtraceSetRegs(pid_t pid, struct user_regs_struct regs);
> -+void PtraceSetRegs(pid_t pid, user_regs_struct regs);
> -
> - // poke a long word into an address
> - void PtracePoke(pid_t pid, unsigned long addr, long data);
> ---
> -2.14.1
> -
> diff --git a/meta-python/recipes-devtools/python/python-
> pyflame-1.6.6/0001-symbol-Account-for-prelinked-shared-objects.patch b/
> meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-symbol-
> Account-for-prelinked-shared-objects.patch
> deleted file mode 100644
> index 3eefc9cb98..0000000000
> --- a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-
> symbol-Account-for-prelinked-shared-objects.patch
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -From 007965d341349679607699d005c4af811b2c419a Mon Sep 17 00:00:00 2001
> -From: Andrew Jeffery <andrew@aj.id.au>
> -Date: Fri, 4 May 2018 11:23:53 +0930
> -Subject: [PATCH] symbol: Account for prelinked shared objects
> -
> -Some projects, such as those derived from Yocto, tend to prelink their
> -binaries and libraries to reduce runtime overhead. Currently this trips
> -up pyflame in its symbol address calculations, and leads to ptrace
> -failures due to spurious addresses:
> -
> - $ pyflame -t python -c "print 'foo'"
> - Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482,
> addr 0x9f9b1d70): Input/output error
> - Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482,
> addr 0x9f9b1d70): Input/output error
> - Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482,
> addr 0x9f9b1d70): Input/output error
> - Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482,
> addr 0x9f9b1d70): Input/output error
> - Unexpected ptrace(2) exception: Failed to PTRACE_PEEKDATA (pid 1482,
> addr 0x9f9b1d70): Input/output error
> - ...
> -
> -Add support for reading a prelinked base p_vaddr out of the ELF and
> -adjust the PyAddresses values accordingly.
> -
> -Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ----
> - src/symbol.cc | 15 +++++++++++++++
> - src/symbol.h | 29 ++++++++++++++++++++++++++++-
> - 2 files changed, 43 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/symbol.cc b/src/symbol.cc
> -index 125174efeeb5..39c3e8132dd1 100644
> ---- a/src/symbol.cc
> -+++ b/src/symbol.cc
> -@@ -166,6 +166,17 @@ PyABI ELF::WalkTable(int sym, int str, PyAddresses
> *addrs) {
> - return abi;
> - }
> -
> -+addr_t ELF::GetBaseAddress() {
> -+ int32_t phnum = hdr()->e_phnum;
> -+ int32_t i;
> -+ for (i = 0; i < phnum && phdr(i)->p_type != PT_LOAD; i++) {
> -+ }
> -+ if (i == phnum) {
> -+ throw FatalException("Failed to find PT_LOAD entry in program
> headers");
> -+ }
> -+ return phdr(i)->p_vaddr;
> -+}
> -+
> - PyAddresses ELF::GetAddresses(PyABI *abi) {
> - PyAddresses addrs;
> - PyABI detected_abi = WalkTable(dynsym_, dynstr_, &addrs);
> -@@ -176,6 +187,10 @@ PyAddresses ELF::GetAddresses(PyABI *abi) {
> - if (abi != nullptr) {
> - *abi = detected_abi;
> - }
> -+ // Handle prelinked shared objects
> -+ if (hdr()->e_type == ET_DYN) {
> -+ return addrs - GetBaseAddress();
> -+ }
> - return addrs;
> - }
> - } // namespace pyflame
> -diff --git a/src/symbol.h b/src/symbol.h
> -index 124853bcc1c1..bb92b9a2604b 100644
> ---- a/src/symbol.h
> -+++ b/src/symbol.h
> -@@ -28,15 +28,19 @@
> -
> - #if USE_ELF64
> - #define ehdr_t Elf64_Ehdr
> -+#define phdr_t Elf64_Phdr
> - #define shdr_t Elf64_Shdr
> - #define dyn_t Elf64_Dyn
> - #define sym_t Elf64_Sym
> -+#define addr_t Elf64_Addr
> - #define ARCH_ELFCLASS ELFCLASS64
> - #else
> - #define ehdr_t Elf32_Ehdr
> -+#define phdr_t Elf32_Phdr
> - #define shdr_t Elf32_Shdr
> - #define dyn_t Elf32_Dyn
> - #define sym_t Elf32_Sym
> -+#define addr_t Elf32_Addr
> - #define ARCH_ELFCLASS ELFCLASS32
> - #endif
> -
> -@@ -67,8 +71,18 @@ struct PyAddresses {
> - interp_head_hint(0),
> - pie(false) {}
> -
> -+ PyAddresses operator-(const unsigned long base) const {
> -+ PyAddresses res(*this);
> -+ res.tstate_addr = this->tstate_addr == 0 ? 0 : this->tstate_addr -
> base;
> -+ res.interp_head_addr =
> -+ this->interp_head_addr == 0 ? 0 : this->interp_head_addr -
> base;
> -+ res.interp_head_fn_addr =
> -+ this->interp_head_fn_addr == 0 ? 0 : this->interp_head_fn_addr
> - base;
> -+ return res;
> -+ }
> -+
> - PyAddresses operator+(const unsigned long base) const {
> -- PyAddresses res;
> -+ PyAddresses res(*this);
> - res.tstate_addr = this->tstate_addr == 0 ? 0 : this->tstate_addr +
> base;
> - res.interp_head_addr =
> - this->interp_head_addr == 0 ? 0 : this->interp_head_addr +
> base;
> -@@ -113,6 +127,9 @@ class ELF {
> - // ABI.
> - PyAddresses GetAddresses(PyABI *abi);
> -
> -+ // Extract the base load address from the Program Header table
> -+ addr_t GetBaseAddress();
> -+
> - private:
> - void *addr_;
> - size_t length_;
> -@@ -122,6 +139,16 @@ class ELF {
> - return reinterpret_cast<const ehdr_t *>(addr_);
> - }
> -
> -+ inline const phdr_t *phdr(int idx) const {
> -+ if (idx < 0) {
> -+ std::ostringstream ss;
> -+ ss << "Illegal phdr index: " << idx;
> -+ throw FatalException(ss.str());
> -+ }
> -+ return reinterpret_cast<const phdr_t *>(p() + hdr()->e_phoff +
> -+ idx * hdr()->e_phentsize);
> -+ }
> -+
> - inline const shdr_t *shdr(int idx) const {
> - if (idx < 0) {
> - std::ostringstream ss;
> ---
> -2.14.1
> -
> diff --git a/meta-python/recipes-devtools/python/python-pyflame.inc b/
> meta-python/recipes-devtools/python/python-pyflame.inc
> index 340aab74ef..b3b153c57b 100644
> --- a/meta-python/recipes-devtools/python/python-pyflame.inc
> +++ b/meta-python/recipes-devtools/python/python-pyflame.inc
> @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
> LIC_FILES_CHKSUM = "file://${S}/
> LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> DEPENDS = "python"
>
> -SRC_URI = "git://github.com/uber/pyflame.git;protocol=https"
> +SRC_URI = "git://github.com/uber/pyflame.git;protocol=https;nobranch=1"
> S = "${WORKDIR}/git"
>
> inherit pkgconfig autotools
> @@ -13,3 +13,4 @@ inherit pkgconfig autotools
> COMPATIBLE_HOST_libc-musl_class-target = "null"
> COMPATIBLE_HOST_mipsarch_class-target = "null"
> COMPATIBLE_HOST_aarch64_class-target = "null"
> +COMPATIBLE_HOST_powerpc_class-target = "null"
> diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
> b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
> deleted file mode 100644
> index 8dedb89286..0000000000
> --- a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require python-pyflame.inc
> -
> -# v1.6.6
> -SRCREV = "8a9d8c2acc3b3bb027475b738134f1e6fff14e6c"
> -SRC_URI +=
> "file://0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch"
> -SRC_URI +=
> "file://0001-symbol-Account-for-prelinked-shared-objects.patch"
> diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
> b/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
> new file mode 100644
> index 0000000000..cb08f30a67
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python-pyflame_1.6.7.bb
> @@ -0,0 +1,4 @@
> +require python-pyflame.inc
> +
> +# v1.6.7
> +SRCREV = "c151d2f34737f28a1f5266a003b2b0720bbd9f96"
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [meta-oe][PATCH 17/18] redis: Update to 4.0.12
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (14 preceding siblings ...)
2018-12-23 21:35 ` [meta-python][PATCH 16/18] python-pyflame: Upgrade to 1.6.7 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
2018-12-23 21:35 ` [meta-oe][PATCH 18/18] android-tools: Disable for powerpc/powerpc64 Khem Raj
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
Exclude atomics on ppc as well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../redis/{redis_4.0.8.bb => redis_4.0.12.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/redis/{redis_4.0.8.bb => redis_4.0.12.bb} (90%)
diff --git a/meta-oe/recipes-extended/redis/redis_4.0.8.bb b/meta-oe/recipes-extended/redis/redis_4.0.12.bb
similarity index 90%
rename from meta-oe/recipes-extended/redis/redis_4.0.8.bb
rename to meta-oe/recipes-extended/redis/redis_4.0.12.bb
index 80d36d2ba1..af99537f52 100644
--- a/meta-oe/recipes-extended/redis/redis_4.0.8.bb
+++ b/meta-oe/recipes-extended/redis/redis_4.0.12.bb
@@ -17,9 +17,10 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
SRC_URI_append_mips = " file://remove-atomics.patch"
SRC_URI_append_arm = " file://remove-atomics.patch"
+SRC_URI_append_powerpc = " file://remove-atomics.patch"
-SRC_URI[md5sum] = "c75b11e4177e153e4dc1d8dd3a6174e4"
-SRC_URI[sha256sum] = "ff0c38b8c156319249fec61e5018cf5b5fe63a65b61690bec798f4c998c232ad"
+SRC_URI[md5sum] = "48f240fd2d96b1b579300b866398edbc"
+SRC_URI[sha256sum] = "6447259d2eed426a949c9c13f8fdb2d91fb66d9dc915dd50db13b87f46d93162"
inherit autotools-brokensep update-rc.d systemd useradd
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [meta-oe][PATCH 18/18] android-tools: Disable for powerpc/powerpc64
2018-12-23 21:35 [meta-oe][PATCH 01/18] modemmanager: Fix build with gcc9 Khem Raj
` (15 preceding siblings ...)
2018-12-23 21:35 ` [meta-oe][PATCH 17/18] redis: Update to 4.0.12 Khem Raj
@ 2018-12-23 21:35 ` Khem Raj
16 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2018-12-23 21:35 UTC (permalink / raw)
To: openembedded-devel
* There is no support for linux-ppc in this version
* Point mips64 to right linux port
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../android-tools/android-tools_5.1.1.r37.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 2604f65e1f..d49e53714d 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -57,6 +57,9 @@ B = "${WORKDIR}/${BPN}"
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
+COMPATIBLE_HOST_powerpc = "(null)"
+COMPATIBLE_HOST_powerpc64 = "(null)"
+
inherit systemd
SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service"
@@ -91,6 +94,9 @@ do_compile() {
mips|mipsel)
export android_arch=linux-mips
;;
+ mips64|mips64el)
+ export android_arch=linux-mips64
+ ;;
powerpc|powerpc64)
export android_arch=linux-ppc
;;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread