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.
Also remove two Debian-specific patches (one for Hurd, one for kfreebsd) so we're not carrying useless patches. Signed-off-by: Ross Burton <ross.bur...@intel.com> --- meta/recipes-devtools/elfutils/elfutils_0.172.bb | 2 -- .../0001-libasm-may-link-with-libbz2-if-found.patch | 1 + ...e-differences-between-mips-machine-identifiers.patch | 3 +++ .../elfutils/files/debian/0001-arm_backend.patch | 2 +- .../elfutils/files/debian/0001-disable_werror.patch | 2 +- .../elfutils/files/debian/0001-fix-gcc7-ftbfs.patch | 2 +- .../elfutils/files/debian/0001-hppa_backend.patch | 2 +- .../elfutils/files/debian/0001-mips_backend.patch | 2 +- .../elfutils/files/debian/0001-mips_readelf_w.patch | 2 +- .../files/debian/0001-testsuite-ignore-elflint.patch | 2 +- ...2-Add-support-for-mips64-abis-in-mips_retval.c.patch | 3 +++ .../0003-Add-mips-n64-relocation-format-hack.patch | 3 +++ .../elfutils/files/debian/hurd_path.patch | 14 -------------- .../elfutils/files/debian/ignore_strmerge.diff | 3 +++ .../elfutils/files/debian/kfreebsd_path.patch | 17 ----------------- 15 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/debian/hurd_path.patch delete mode 100644 meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.172.bb b/meta/recipes-devtools/elfutils/elfutils_0.172.bb index 04f6709d5a4..9d02211d497 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.172.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.172.bb @@ -21,11 +21,9 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://debian/0001-mips_backend.patch \ file://debian/0001-testsuite-ignore-elflint.patch \ file://debian/0001-mips_readelf_w.patch \ - file://debian/kfreebsd_path.patch \ file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \ file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \ file://debian/0003-Add-mips-n64-relocation-format-hack.patch \ - file://debian/hurd_path.patch \ file://debian/ignore_strmerge.diff \ file://debian/0001-fix-gcc7-ftbfs.patch \ file://debian/0001-disable_werror.patch \ diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch index a8e9e50d15c..c342053aace 100644 --- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +++ b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch @@ -9,6 +9,7 @@ where indirect libraries may be not found by linker | /mnt/a/oe/build/tmp/work/riscv64-bec-linux/elfutils/0.170-r0/recipe-sysroot/usr/lib/libbz2.so.1: error adding symbols: DSO missing from command line | collect2: error: ld returned 1 exit status +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.k...@gmail.com> --- src/Makefile.am | 4 ++-- 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 a9a72100317..8c48f4d1b18 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 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu....@windriver.com> + From 77cb4a53c270d5854d3af24f19547bc3de825233 Mon Sep 17 00:00:00 2001 From: James Cowgill <james...@cowgill.org.uk> 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 540ba95e0e3..4ed81194b35 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....@windriver.com> Date: Fri, 29 Jun 2018 15:42:39 +0800 Subject: [PATCH] arm_backend -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] arm_backend.diff and rebase to 0.172 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 66de238418a..0f32b8742c1 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 Signed-off-by: Helmut Grohne <hel...@subdivi.de> -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] mdisable_werror.patc and rebase to 0.172 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 226ec7f5301..26869a3a7dd 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....@windriver.com> Date: Fri, 29 Jun 2018 15:59:57 +0800 Subject: [PATCH] fix gcc7 ftbfs -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] fix-gcc7-ftbfs.diff and rebase to 0.172 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 c0dbed798d3..2c5d4fa4ba7 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....@windriver.com> Date: Fri, 29 Jun 2018 15:39:46 +0800 Subject: [PATCH] hppa_backend -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] hppa_backend.diff and rebase to 0.172 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 3004e198281..d04da72cc5d 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....@windriver.com> Date: Fri, 29 Jun 2018 15:45:58 +0800 Subject: [PATCH] mips_backend -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] mips_backend.diff and rebase to 0.172 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 294944ea543..f3ab3da8d2a 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. Signed-off-by: Kurt Roeckx <k...@roeckx.be> -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] mips_readelf_w.patch and rebase to 0.172 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 14f69093781..f4c6f40fc5e 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. So we run the tests on all archs to see what breaks, but if it breaks we ignore the result (exitcode 77 means: this test was skipped). -Upstream-Status: Backport from debian +Upstream-Status: Pending [from debian] testsuite-ignore-elflint.diff and rebase to 0.172 Signed-off-by: Hongxu Jia <hongxu....@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 72125c9ff06..4bdb1ff3cf5 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 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu....@windriver.com> + From fdaab18a65ed2529656baa64cb6169f34d7e507b Mon Sep 17 00:00:00 2001 From: James Cowgill <james...@cowgill.org.uk> 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 6c0ae37fea7..d27ce6dc9c4 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 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu....@windriver.com> + From 59d4b8c48e5040af7e02b34eb26ea602ec82a38e Mon Sep 17 00:00:00 2001 From: James Cowgill <james...@cowgill.org.uk> 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 4440e39e0ae..00000000000 --- a/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: elfutils-0.165/tests/run-native-test.sh -=================================================================== ---- elfutils-0.165.orig/tests/run-native-test.sh -+++ elfutils-0.165/tests/run-native-test.sh -@@ -83,6 +83,9 @@ native_test() - # "cannot attach to process: Function not implemented". - [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 - -+# hurd's /proc/$PID/maps does not give paths yet. -+[ "$(uname)" = "GNU" ] && exit 77 -+ - native_test ${abs_builddir}/allregs - native_test ${abs_builddir}/funcretval - diff --git a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff index 1e6d7a2de6b..55513eeddc4 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 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu....@windriver.com> + --- elfutils-0.165.orig/tests/run-strip-strmerge.sh +++ elfutils-0.165/tests/run-strip-strmerge.sh @@ -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 9a19b58b507..00000000000 --- a/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: b/tests/run-native-test.sh -=================================================================== ---- a/tests/run-native-test.sh -+++ b/tests/run-native-test.sh -@@ -77,6 +77,12 @@ native_test() - test $native -eq 0 || testrun "$@" -p $native > /dev/null - } - -+# On the Debian buildds, GNU/kFreeBSD linprocfs /proc/$PID/maps does -+# not give absolute paths due to sbuild's bind mounts (bug #570805) -+# therefore the next two test programs are expected to fail with -+# "cannot attach to process: Function not implemented". -+[ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 -+ - native_test ${abs_builddir}/allregs - native_test ${abs_builddir}/funcretval - -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
