diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
| commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
| tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
| download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff')
| -rw-r--r-- | poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff index 53332467a..55513eedd 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff +++ b/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff @@ -1,19 +1,8 @@ -From d326ad99be856815260a04e573fc97044c02f444 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 2 Jul 2018 13:57:09 +0800 -Subject: [PATCH] elfutils: 0.170 -> 0.172 - Upstream-Status: Pending [from debian] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tests/run-strip-strmerge.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/run-strip-strmerge.sh b/tests/run-strip-strmerge.sh -index aa9c1eb..2bab8ec 100755 ---- a/tests/run-strip-strmerge.sh -+++ b/tests/run-strip-strmerge.sh +--- elfutils-0.165.orig/tests/run-strip-strmerge.sh ++++ elfutils-0.165/tests/run-strip-strmerge.sh @@ -30,7 +30,7 @@ remerged=remerged.elf tempfiles $merged $stripped $debugfile $remerged |