summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
diff options
context:
space:
mode:
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, 13 insertions, 2 deletions
diff --git a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
index 55513eeddc..53332467a4 100644
--- a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
@@ -1,8 +1,19 @@
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
1Upstream-Status: Pending [from debian] 6Upstream-Status: Pending [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3 8
4--- elfutils-0.165.orig/tests/run-strip-strmerge.sh 9---
5+++ elfutils-0.165/tests/run-strip-strmerge.sh 10 tests/run-strip-strmerge.sh | 2 +-
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
6@@ -30,7 +30,7 @@ remerged=remerged.elf 17@@ -30,7 +30,7 @@ remerged=remerged.elf
7 tempfiles $merged $stripped $debugfile $remerged 18 tempfiles $merged $stripped $debugfile $remerged
8 19