mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
crash: Upgrade to 8.0.2
Upgrade crash to 8.0.2 and rebase 4 patches to the new version. Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu
Khem Raj
parent
4f45bf76d2
commit
888be5219e
|
|
@ -1,27 +1,27 @@
|
|||
From 73269df4d8196abe81112acaa2613155b308a8b8 Mon Sep 17 00:00:00 2001
|
||||
From e3ba432243d9be4e845daabc78a0ae7c03c680f5 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Fri, 9 Jan 2015 11:51:18 +0900
|
||||
Subject: [PATCH 1/9] cross_add_configure_option
|
||||
Subject: [PATCH] cross_add_configure_option
|
||||
|
||||
|
||||
%% original patch: 0001-cross_add_configure_option.patch
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a2baec1..f1972c8 100644
|
||||
index 7266e305..390fc0ef 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -232,7 +232,7 @@ gdb_merge: force
|
||||
@@ -260,7 +260,7 @@ gdb_merge: force
|
||||
@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
|
||||
@rm -f ${PROGRAM}
|
||||
@if [ ! -f ${GDB}/config.status ]; then \
|
||||
- (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \
|
||||
+ (cd ${GDB}; ./configure --host=${GDB_TARGET} --build=${GDB_HOST} --with-separate-debug-dir=/usr/lib/debug \
|
||||
--with-bugurl="" --with-expat=no --with-python=no --disable-sim; \
|
||||
make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
|
||||
else make --no-print-directory rebuild; fi
|
||||
@@ -283,7 +283,7 @@ force:
|
||||
$(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
|
||||
else $(MAKE) rebuild; fi
|
||||
@@ -306,7 +306,7 @@ force:
|
||||
|
||||
make_configure: force
|
||||
@rm -f configure
|
||||
|
|
@ -30,6 +30,3 @@ index a2baec1..f1972c8 100644
|
|||
|
||||
clean: make_configure
|
||||
@./configure ${CONF_TARGET_FLAG} -q -b
|
||||
--
|
||||
2.8.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,19 @@
|
|||
--- crash-5.1.8/Makefile.orig 2011-12-27 11:21:58.220652105 +0900
|
||||
+++ crash-5.1.8/Makefile 2011-12-27 11:22:29.563651593 +0900
|
||||
@@ -285,6 +285,7 @@
|
||||
From 2f200ceed289f935b5e7ec230454a22dd76e42b0 Mon Sep 17 00:00:00 2001
|
||||
From: leimaohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Mon, 12 Jan 2015 11:52:35 +0800
|
||||
Subject: [PATCH] crash: add new recipe
|
||||
|
||||
---
|
||||
Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 79aef176..7266e305 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -295,6 +295,7 @@ gdb_patch:
|
||||
|
||||
library: make_build_data ${OBJECT_FILES}
|
||||
library: ${OBJECT_FILES}
|
||||
ar -rs ${PROGRAM}lib.a ${OBJECT_FILES}
|
||||
+ ${RANLIB} ${PROGRAM}lib.a
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,45 @@
|
|||
From 8b882650b730cb6e025d47d65574f43549b7a1a3 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Thu, 9 Mar 2023 10:28:28 +0800
|
||||
Subject: [PATCH] Makefile: Put gdb source tarball in SRC_URI
|
||||
|
||||
Put gdb source tarball in SRC_URI and don't fetch and extract it during
|
||||
do_compile.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index bb0a34e..5eb7604 100644
|
||||
index 79aef17..146da6a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -228,7 +228,7 @@ all: make_configure
|
||||
# @make --no-print-directory extensions
|
||||
@@ -254,7 +254,7 @@ all: make_configure
|
||||
# @$(MAKE) extensions
|
||||
|
||||
gdb_merge: force
|
||||
- @if [ ! -f ${GDB}/README ]; then \
|
||||
+ @if [ ! -f ${GDB}/${GDB}.patch ]; then \
|
||||
make --no-print-directory gdb_unzip; fi
|
||||
$(MAKE) gdb_unzip; fi
|
||||
@echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs
|
||||
@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
|
||||
@@ -255,12 +255,6 @@ gdb_unzip:
|
||||
@rm -f gdb.files
|
||||
@for FILE in ${GDB_FILES} dummy; do\
|
||||
echo $$FILE >> gdb.files; done
|
||||
@@ -281,12 +281,6 @@ gdb_unzip:
|
||||
@rm -f gdb.files
|
||||
@for FILE in ${GDB_FILES} dummy; do\
|
||||
echo $$FILE >> gdb.files; done
|
||||
- @if [ ! -f ${GDB}.tar.gz ] && [ ! -f /usr/bin/wget ]; then \
|
||||
- echo /usr/bin/wget is required to download ${GDB}.tar.gz; echo; exit 1; fi
|
||||
- @if [ ! -f ${GDB}.tar.gz ] && [ -f /usr/bin/wget ]; then \
|
||||
- [ ! -t 2 ] && WGET_OPTS="--progress=dot:mega"; \
|
||||
- wget $$WGET_OPTS http://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi
|
||||
- @tar --exclude-from gdb.files -xzmf ${GDB}.tar.gz
|
||||
@make --no-print-directory gdb_patch
|
||||
|
||||
@$(MAKE) gdb_patch
|
||||
|
||||
gdb_patch:
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
From af49d8df559aa18f97d14ab7971f211238a16041 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Thu, 9 Mar 2023 10:50:10 +0800
|
||||
Subject: [PATCH] Makefile: Don't write ${TARGET} to crash.target
|
||||
|
||||
This enables parallel building (multiple jobs in gdb) by reading the
|
||||
value from GDB_MAKE_JOBS.
|
||||
|
||||
|
|
@ -8,19 +13,26 @@ Upstream-Status: Pending
|
|||
Don't write ${TARGET} to crash.target which causes rebuild fails.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
--
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 27a1d47..bcf2d2f 100644
|
||||
index cd25c7d..d61c4c5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -232,8 +232,8 @@ gdb_merge: force
|
||||
@@ -262,8 +262,8 @@ gdb_merge: force
|
||||
@if [ ! -f ${GDB}/config.status ]; then \
|
||||
(cd ${GDB}; ./configure --host=${GDB_TARGET} --build=${GDB_HOST} --with-separate-debug-dir=/usr/lib/debug \
|
||||
--with-bugurl="" --with-expat=no --with-python=no --disable-sim; \
|
||||
- make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
|
||||
- else make --no-print-directory rebuild; fi
|
||||
+ make --no-print-directory CRASH_TARGET=${TARGET} ${GDB_MAKE_JOBS}; ) \
|
||||
+ else make --no-print-directory ${GDB_MAKE_JOBS} rebuild; fi
|
||||
- $(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
|
||||
- else $(MAKE) rebuild; fi
|
||||
+ $(MAKE) CRASH_TARGET=${TARGET} ${GDB_MAKE_JOBS}; ) \
|
||||
+ else $(MAKE) ${GDB_MAKE_JOBS} rebuild; fi
|
||||
@if [ ! -f ${PROGRAM} ]; then \
|
||||
echo; echo "${PROGRAM} build failed"; \
|
||||
echo; exit 1; fi
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http
|
|||
file://donnot-extract-gdb-during-do-compile.patch \
|
||||
file://gdb_build_jobs_and_not_write_crash_target.patch \
|
||||
"
|
||||
SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae"
|
||||
SRCREV = "f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91"
|
||||
|
||||
SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user