diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-06-25 22:34:46 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:25 +0200 |
commit | ec9f60a6ef6e4434705756511aa76fc4ee6e4f1d (patch) | |
tree | 13b8dee1195e43cbc1018a09f9c38e60b0d41d94 | |
parent | 81a3addfe5b74bd5779ab9cd8fe047d348ab8c25 (diff) | |
download | meta-openembedded-ec9f60a6ef6e4434705756511aa76fc4ee6e4f1d.tar.gz |
crash: Upgrade to 7.1.9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch | 112 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash_7.1.9.bb (renamed from meta-oe/recipes-kernel/crash/crash_7.1.8.bb) | 8 |
2 files changed, 3 insertions, 117 deletions
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch deleted file mode 100644 index 9434815d8f..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch +++ /dev/null @@ -1,112 +0,0 @@ -From b8c8fbe0a2481e97fc57dd596346827a692a5768 Mon Sep 17 00:00:00 2001 -From: Dave Anderson <anderson@redhat.com> -Date: Tue, 28 Mar 2017 15:44:40 -0400 -Subject: [PATCH 1/3] Fix for a compilation error if glibc-2.25 or later has - been installed on the host build machine. Without the patch, the build fails - with the error message "amd64-linux-nat.c:496:1: error: conflicting types for - 'ps_get_thread_area'". (anderson@redhat.com) - -Upstream-Status: Backport - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - Makefile | 6 +++++ - configure.c | 2 +- - gdb-7.6-proc_service.h.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 62 insertions(+), 1 deletion(-) - create mode 100644 gdb-7.6-proc_service.h.patch - -diff --git a/Makefile b/Makefile -index 202ef8b..b6b7e80 100644 ---- a/Makefile -+++ b/Makefile -@@ -264,6 +264,12 @@ gdb_patch: - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ - fi -+ if [ -f /usr/include/proc_service.h ]; then \ -+ grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ -+ if [ $$? -eq 0 ]; then \ -+ patch -p0 < ${GDB}-proc_service.h.patch; \ -+ fi; \ -+ fi - - library: make_build_data ${OBJECT_FILES} - ar -rs ${PROGRAM}lib.a ${OBJECT_FILES} -diff --git a/configure.c b/configure.c -index d63cdd7..776defe 100644 ---- a/configure.c -+++ b/configure.c -@@ -240,7 +240,7 @@ struct supported_gdb_version { - "7.6", - "GDB_FILES=${GDB_7.6_FILES}", - "GDB_OFILES=${GDB_7.6_OFILES}", -- "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch", -+ "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch gdb-7.6-proc_service.h.patch", - "GDB_FLAGS=-DGDB_7_6", - "GPLv3" - }, -diff --git a/gdb-7.6-proc_service.h.patch b/gdb-7.6-proc_service.h.patch -new file mode 100644 -index 0000000..49d18bb ---- /dev/null -+++ b/gdb-7.6-proc_service.h.patch -@@ -0,0 +1,55 @@ -+--- gdb-7.6/gdb/gdb_proc_service.h.orig -++++ gdb-7.6/gdb/gdb_proc_service.h -+@@ -115,7 +115,7 @@ extern pid_t ps_getpid (struct ps_procha -+ /* Fetch the special per-thread address associated with the given LWP. -+ This call is only used on a few platforms (most use a normal register). -+ The meaning of the `int' parameter is machine-dependent. */ -+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *, -++extern ps_err_e ps_get_thread_area (struct ps_prochandle *, -+ lwpid_t, int, psaddr_t *); -+ -+ -+--- gdb-7.6/gdb/amd64-linux-nat.c.orig -++++ gdb-7.6/gdb/amd64-linux-nat.c -+@@ -493,7 +493,7 @@ amd64_linux_new_fork (struct lwp_info *p -+ a request for a thread's local storage address. */ -+ -+ ps_err_e -+-ps_get_thread_area (const struct ps_prochandle *ph, -++ps_get_thread_area (struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+ { -+ if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32) -+--- gdb-7.6/gdb/aarch64-linux-nat.c.orig -++++ gdb-7.6/gdb/aarch64-linux-nat.c -+@@ -750,7 +750,7 @@ aarch64_linux_new_fork (struct lwp_info -+ storage (or its descriptor). */ -+ -+ ps_err_e -+-ps_get_thread_area (const struct ps_prochandle *ph, -++ps_get_thread_area (struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+ { -+ struct iovec iovec; -+--- gdb-7.6/gdb/arm-linux-nat.c.orig -++++ gdb-7.6/gdb/arm-linux-nat.c -+@@ -613,7 +613,7 @@ supply_fpregset (struct regcache *regcac -+ /* Fetch the thread-local storage pointer for libthread_db. */ -+ -+ ps_err_e -+-ps_get_thread_area (const struct ps_prochandle *ph, -++ps_get_thread_area (struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+ { -+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -+--- gdb-7.6/gdb/i386-linux-nat.c.orig -++++ gdb-7.6/gdb/i386-linux-nat.c -+@@ -849,7 +849,7 @@ i386_linux_new_fork (struct lwp_info *pa -+ storage (or its descriptor). */ -+ -+ ps_err_e -+-ps_get_thread_area (const struct ps_prochandle *ph, -++ps_get_thread_area (struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+ { -+ /* NOTE: cagney/2003-08-26: The definition of this buffer is found --- -2.8.1 - diff --git a/meta-oe/recipes-kernel/crash/crash_7.1.8.bb b/meta-oe/recipes-kernel/crash/crash_7.1.9.bb index 9cbb291f3f..93208e398f 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.1.8.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.1.9.bb @@ -10,7 +10,7 @@ SECTION = "devel" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "zlib readline" +DEPENDS = "zlib readline coreutils-native" SRC_URI = "https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz;name=gdb;subdir=${BP} \ @@ -22,14 +22,12 @@ SRC_URI = "https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;download file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ file://remove-unrecognized-gcc-option-m32-for-mips.patch \ - file://0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ file://0004-crash-fix-build-failure-with-mips.patch \ " - -SRC_URI[md5sum] = "31787074f267a3536eebff008a0652ec" -SRC_URI[sha256sum] = "9965dee9199d7e39764fbee7f21c7c45b1f7b6d17c8e92ad62f468f062876478" +SRC_URI[md5sum] = "f3b44a151dbe7046462b9caaa9847ca6" +SRC_URI[sha256sum] = "c48e1269443a6a8e8337e328b21b03e4e50248f607eed83fbb27eb0d833d6aa4" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" |