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 | |
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')
13 files changed, 19 insertions, 38 deletions
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch b/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch index a9a7210031..8c48f4d1b1 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | Upstream-Status: Pending [from debian] | ||
2 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | |||
1 | From 77cb4a53c270d5854d3af24f19547bc3de825233 Mon Sep 17 00:00:00 2001 | 4 | From 77cb4a53c270d5854d3af24f19547bc3de825233 Mon Sep 17 00:00:00 2001 |
2 | From: James Cowgill <james410@cowgill.org.uk> | 5 | From: James Cowgill <james410@cowgill.org.uk> |
3 | Date: Mon, 5 Jan 2015 15:16:58 +0000 | 6 | Date: Mon, 5 Jan 2015 15:16:58 +0000 |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch b/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch index 540ba95e0e..4ed81194b3 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch | |||
@@ -3,7 +3,7 @@ From: Hongxu Jia <hongxu.jia@windriver.com> | |||
3 | Date: Fri, 29 Jun 2018 15:42:39 +0800 | 3 | Date: Fri, 29 Jun 2018 15:42:39 +0800 |
4 | Subject: [PATCH] arm_backend | 4 | Subject: [PATCH] arm_backend |
5 | 5 | ||
6 | Upstream-Status: Backport from debian | 6 | Upstream-Status: Pending [from debian] |
7 | arm_backend.diff and rebase to 0.172 | 7 | arm_backend.diff and rebase to 0.172 |
8 | 8 | ||
9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch b/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch index 66de238418..0f32b8742c 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch | |||
@@ -8,7 +8,7 @@ Last-Update: 2018-01-01 | |||
8 | 8 | ||
9 | Signed-off-by: Helmut Grohne <helmut@subdivi.de> | 9 | Signed-off-by: Helmut Grohne <helmut@subdivi.de> |
10 | 10 | ||
11 | Upstream-Status: Backport from debian | 11 | Upstream-Status: Pending [from debian] |
12 | mdisable_werror.patc and rebase to 0.172 | 12 | mdisable_werror.patc and rebase to 0.172 |
13 | 13 | ||
14 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 14 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch b/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch index 226ec7f530..26869a3a7d 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch | |||
@@ -3,7 +3,7 @@ From: Hongxu Jia <hongxu.jia@windriver.com> | |||
3 | Date: Fri, 29 Jun 2018 15:59:57 +0800 | 3 | Date: Fri, 29 Jun 2018 15:59:57 +0800 |
4 | Subject: [PATCH] fix gcc7 ftbfs | 4 | Subject: [PATCH] fix gcc7 ftbfs |
5 | 5 | ||
6 | Upstream-Status: Backport from debian | 6 | Upstream-Status: Pending [from debian] |
7 | fix-gcc7-ftbfs.diff and rebase to 0.172 | 7 | fix-gcc7-ftbfs.diff and rebase to 0.172 |
8 | 8 | ||
9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch b/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch index c0dbed798d..2c5d4fa4ba 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch | |||
@@ -3,7 +3,7 @@ From: Hongxu Jia <hongxu.jia@windriver.com> | |||
3 | Date: Fri, 29 Jun 2018 15:39:46 +0800 | 3 | Date: Fri, 29 Jun 2018 15:39:46 +0800 |
4 | Subject: [PATCH] hppa_backend | 4 | Subject: [PATCH] hppa_backend |
5 | 5 | ||
6 | Upstream-Status: Backport from debian | 6 | Upstream-Status: Pending [from debian] |
7 | hppa_backend.diff and rebase to 0.172 | 7 | hppa_backend.diff and rebase to 0.172 |
8 | 8 | ||
9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch b/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch index 3004e19828..d04da72cc5 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch | |||
@@ -3,7 +3,7 @@ From: Hongxu Jia <hongxu.jia@windriver.com> | |||
3 | Date: Fri, 29 Jun 2018 15:45:58 +0800 | 3 | Date: Fri, 29 Jun 2018 15:45:58 +0800 |
4 | Subject: [PATCH] mips_backend | 4 | Subject: [PATCH] mips_backend |
5 | 5 | ||
6 | Upstream-Status: Backport from debian | 6 | Upstream-Status: Pending [from debian] |
7 | mips_backend.diff and rebase to 0.172 | 7 | mips_backend.diff and rebase to 0.172 |
8 | 8 | ||
9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 9 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch b/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch index 294944ea54..f3ab3da8d2 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch | |||
@@ -11,7 +11,7 @@ to be filled in by the backend for the arch. | |||
11 | 11 | ||
12 | Signed-off-by: Kurt Roeckx <kurt@roeckx.be> | 12 | Signed-off-by: Kurt Roeckx <kurt@roeckx.be> |
13 | 13 | ||
14 | Upstream-Status: Backport from debian | 14 | Upstream-Status: Pending [from debian] |
15 | mips_readelf_w.patch and rebase to 0.172 | 15 | mips_readelf_w.patch and rebase to 0.172 |
16 | 16 | ||
17 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz | 17 | http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch b/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch index 14f6909378..f4c6f40fc5 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch | |||
@@ -9,7 +9,7 @@ binutils don't pass elflint. However elfutils shouldn't FTBFS because of this. | |||
9 | So we run the tests on all archs to see what breaks, but if it breaks we ignore | 9 | So we run the tests on all archs to see what breaks, but if it breaks we ignore |
10 | the result (exitcode 77 means: this test was skipped). | 10 | the result (exitcode 77 means: this test was skipped). |
11 | 11 | ||
12 | Upstream-Status: Backport from debian | 12 | Upstream-Status: Pending [from debian] |
13 | testsuite-ignore-elflint.diff and rebase to 0.172 | 13 | testsuite-ignore-elflint.diff and rebase to 0.172 |
14 | 14 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch index 72125c9ff0..4bdb1ff3cf 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | Upstream-Status: Pending [from debian] | ||
2 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | |||
1 | From fdaab18a65ed2529656baa64cb6169f34d7e507b Mon Sep 17 00:00:00 2001 | 4 | From fdaab18a65ed2529656baa64cb6169f34d7e507b Mon Sep 17 00:00:00 2001 |
2 | From: James Cowgill <james410@cowgill.org.uk> | 5 | From: James Cowgill <james410@cowgill.org.uk> |
3 | Date: Mon, 5 Jan 2015 15:17:01 +0000 | 6 | Date: Mon, 5 Jan 2015 15:17:01 +0000 |
diff --git a/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch b/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch index 6c0ae37fea..d27ce6dc9c 100644 --- a/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch +++ b/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | Upstream-Status: Pending [from debian] | ||
2 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | |||
1 | From 59d4b8c48e5040af7e02b34eb26ea602ec82a38e Mon Sep 17 00:00:00 2001 | 4 | From 59d4b8c48e5040af7e02b34eb26ea602ec82a38e Mon Sep 17 00:00:00 2001 |
2 | From: James Cowgill <james410@cowgill.org.uk> | 5 | From: James Cowgill <james410@cowgill.org.uk> |
3 | Date: Mon, 5 Jan 2015 15:17:02 +0000 | 6 | Date: Mon, 5 Jan 2015 15:17:02 +0000 |
diff --git a/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch b/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch deleted file mode 100644 index 4440e39e0a..0000000000 --- a/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: elfutils-0.165/tests/run-native-test.sh | ||
2 | =================================================================== | ||
3 | --- elfutils-0.165.orig/tests/run-native-test.sh | ||
4 | +++ elfutils-0.165/tests/run-native-test.sh | ||
5 | @@ -83,6 +83,9 @@ native_test() | ||
6 | # "cannot attach to process: Function not implemented". | ||
7 | [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 | ||
8 | |||
9 | +# hurd's /proc/$PID/maps does not give paths yet. | ||
10 | +[ "$(uname)" = "GNU" ] && exit 77 | ||
11 | + | ||
12 | native_test ${abs_builddir}/allregs | ||
13 | native_test ${abs_builddir}/funcretval | ||
14 | |||
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 |
diff --git a/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch b/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch deleted file mode 100644 index 9a19b58b50..0000000000 --- a/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Index: b/tests/run-native-test.sh | ||
2 | =================================================================== | ||
3 | --- a/tests/run-native-test.sh | ||
4 | +++ b/tests/run-native-test.sh | ||
5 | @@ -77,6 +77,12 @@ native_test() | ||
6 | test $native -eq 0 || testrun "$@" -p $native > /dev/null | ||
7 | } | ||
8 | |||
9 | +# On the Debian buildds, GNU/kFreeBSD linprocfs /proc/$PID/maps does | ||
10 | +# not give absolute paths due to sbuild's bind mounts (bug #570805) | ||
11 | +# therefore the next two test programs are expected to fail with | ||
12 | +# "cannot attach to process: Function not implemented". | ||
13 | +[ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 | ||
14 | + | ||
15 | native_test ${abs_builddir}/allregs | ||
16 | native_test ${abs_builddir}/funcretval | ||
17 | |||