summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-08-23 11:02:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:43 +0100
commitcc5d6ca85a40199a077403a0d0af0bd22eeefa06 (patch)
tree518e9866a124caa48ff4f6b5e747b76bcd80ea0c /meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
parent5b1e999c41a116a77bf22e3d6546eaabf67b2946 (diff)
downloadpoky-cc5d6ca85a40199a077403a0d0af0bd22eeefa06.tar.gz
elfutils: 0.176 -> 0.177
- Update Debian patches http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz - Rebase Debian patches to 0.177 debian/hppa_backend.diff debian/mips_backend.diff debian/arm_backend.diff debian/mips_readelf_w.patch debian/testsuite-ignore-elflint.diff debian/mips_cfi.patch - Fix build failure while applying debian patches 0001-fix-compile-failure-with-debian-patches.patch - Rebase musl patches (From OE-Core rev: 35143611034758cc670e9d88bc93f97fe33c52fc) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff')
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff15
1 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
index 53332467a4..55513eeddc 100644
--- a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
@@ -1,19 +1,8 @@
1From d326ad99be856815260a04e573fc97044c02f444 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 2 Jul 2018 13:57:09 +0800
4Subject: [PATCH] elfutils: 0.170 -> 0.172
5
6Upstream-Status: Pending [from debian] 1Upstream-Status: Pending [from debian]
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8 3
9--- 4--- elfutils-0.165.orig/tests/run-strip-strmerge.sh
10 tests/run-strip-strmerge.sh | 2 +- 5+++ elfutils-0.165/tests/run-strip-strmerge.sh
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/tests/run-strip-strmerge.sh b/tests/run-strip-strmerge.sh
14index aa9c1eb..2bab8ec 100755
15--- a/tests/run-strip-strmerge.sh
16+++ b/tests/run-strip-strmerge.sh
17@@ -30,7 +30,7 @@ remerged=remerged.elf 6@@ -30,7 +30,7 @@ remerged=remerged.elf
18 tempfiles $merged $stripped $debugfile $remerged 7 tempfiles $merged $stripped $debugfile $remerged
19 8