diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
| commit | a75bff085ba9443315222231c42692745e5781e9 (patch) | |
| tree | e1aa422babae0dffc866af076a0274ff26c2c4b2 /poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff | |
| parent | 3e809d0d5cf96c18c5720d1b6b3b53e9f4c0cfae (diff) | |
| parent | 6d4bcf0a75b2a6055055c9ad8ed6b93599082385 (diff) | |
| download | openbmc-a75bff085ba9443315222231c42692745e5781e9.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
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, 13 insertions, 2 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 55513eedd..53332467a 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff +++ b/poky/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff @@ -1,8 +1,19 @@ +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> ---- elfutils-0.165.orig/tests/run-strip-strmerge.sh -+++ elfutils-0.165/tests/run-strip-strmerge.sh +--- + 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 @@ -30,7 +30,7 @@ remerged=remerged.elf tempfiles $merged $stripped $debugfile $remerged |