diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-04 10:15:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 00:22:08 +0100 |
| commit | 740b931d39ae597010e5911a7a07aca17d711428 (patch) | |
| tree | 91c279ef399ca68af8128024527d4c3216ad6887 /meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff | |
| parent | 32320709311af076bb58399d9bb9299446d65f04 (diff) | |
| download | poky-740b931d39ae597010e5911a7a07aca17d711428.tar.gz | |
elfutils: clean up patches
In the upgrade a large number of Upstream-Status tags were dropped, so add them
back. I'm taking the stand that copying a patch Debian is carrying doesn't
count as a backport.
Remove two Debian-specific patches (one for Hurd, one for kfreebsd) so
we're not carrying useless patches.
Remove two patches that are no longer applied.
(From OE-Core rev: b039b26958655aab496b588f4e41a5dea1bfaac1)
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.diff | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff index 1e6d7a2de6..55513eeddc 100644 --- a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff +++ b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | Upstream-Status: Pending [from debian] | ||
| 2 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | |||
| 1 | --- elfutils-0.165.orig/tests/run-strip-strmerge.sh | 4 | --- elfutils-0.165.orig/tests/run-strip-strmerge.sh |
| 2 | +++ elfutils-0.165/tests/run-strip-strmerge.sh | 5 | +++ elfutils-0.165/tests/run-strip-strmerge.sh |
| 3 | @@ -30,7 +30,7 @@ remerged=remerged.elf | 6 | @@ -30,7 +30,7 @@ remerged=remerged.elf |