From 81b8ff8d7355969b85d38a21a9540639e923ba0c Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 16 Nov 2020 13:44:27 +0000 Subject: [PATCH] elfutils: upgrade 0.181 -> 0.182 --- .../elfutils/{elfutils_0.181.bb => elfutils_0.182.bb} | 8 ++++++-- .../elfutils/files/0001-musl-obstack-fts.patch | 6 +++--- meta/recipes-devtools/elfutils/files/0002-musl-libs.patch | 8 ++++---- .../recipes-devtools/elfutils/files/0003-musl-utils.patch | 6 +++--- .../elfutils/files/0004-Fix-error-on-musl.patch | 2 +- .../files/0015-config-eu.am-do-not-use-Werror.patch | 2 +- meta/recipes-devtools/elfutils/files/run-ptest | 6 ------ 7 files changed, 18 insertions(+), 20 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils_0.181.bb => elfutils_0.182.bb} (95%) delete mode 100644 meta/recipes-devtools/elfutils/files/run-ptest diff --git a/meta/recipes-devtools/elfutils/elfutils_0.181.bb b/meta/recipes-devtools/elfutils/elfutils_0.182.bb similarity index 95% rename from meta/recipes-devtools/elfutils/elfutils_0.181.bb rename to meta/recipes-devtools/elfutils/elfutils_0.182.bb index 6c49a5fc26..1277bac53d 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.181.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.182.bb @@ -17,9 +17,13 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \ - file://run-ptest \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ + file://0001-musl-obstack-fts.patch \ + file://0002-musl-libs.patch \ + file://0003-musl-utils.patch \ + file://0004-Fix-error-on-musl.patch \ + file://0015-config-eu.am-do-not-use-Werror.patch \ " SRC_URI_append_libc-musl = " \ file://0001-musl-obstack-fts.patch \ @@ -28,7 +32,7 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3" +SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858" inherit autotools gettext ptest pkgconfig diff --git a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch b/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch index 67d4703c80..ca7caf08d8 100644 --- a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +++ b/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch @@ -1,4 +1,4 @@ -From 1a62bb8e8f2cb0f180c749946a48114e8f391b55 Mon Sep 17 00:00:00 2001 +From dbaa05a519acfe4f6040784f5d4a28ca586c0fc4 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 23 Aug 2019 10:17:25 +0800 Subject: [PATCH] musl-obstack-fts @@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index ab9c751..b057d86 100644 +index 53bab6a..dfea85e 100644 --- a/configure.ac +++ b/configure.ac -@@ -538,6 +538,60 @@ else +@@ -539,6 +539,60 @@ else fi AC_SUBST([argp_LDADD]) diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch index 894e46c3c4..ad71fe4dee 100644 --- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +++ b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch @@ -1,4 +1,4 @@ -From 2e1f8ca0b67c1d1991c14d509938c347e09bae94 Mon Sep 17 00:00:00 2001 +From 1e17a6e128d81f7a88fc5db0c38dc9db5ee53049 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 23 Aug 2019 10:18:47 +0800 Subject: [PATCH] musl-libs @@ -104,7 +104,7 @@ index 7bcf61c..11dcc8b 100644 return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index 0434f1e..5afaee8 100644 +index 548cb56..0900d8f 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -50,6 +50,7 @@ @@ -116,7 +116,7 @@ index 0434f1e..5afaee8 100644 /* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ diff --git a/libelf/elf.h b/libelf/elf.h -index 197b557..8e5b94c 100644 +index ff9f1da..1de8e82 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -21,7 +21,9 @@ @@ -130,7 +130,7 @@ index 197b557..8e5b94c 100644 /* Standard ELF types. */ -@@ -4103,6 +4105,7 @@ enum +@@ -4105,6 +4107,7 @@ enum #define R_ARC_TLS_LE_S9 0x4a #define R_ARC_TLS_LE_32 0x4b diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index 2a21cd37ce..a8b39b5f93 100644 --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch @@ -1,4 +1,4 @@ -From 9b237f19f82d5ab1e0702637fece1866b1ef6681 Mon Sep 17 00:00:00 2001 +From e7e5333ed2e19f25ecbd7121f424eec99d61265a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils @@ -58,7 +58,7 @@ index 6ba6af4..0c7674b 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/readelf.c b/src/readelf.c -index 685d0b1..a842b10 100644 +index 64067a5..630739c 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p) @@ -142,7 +142,7 @@ index 48792a7..198a2e4 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index 9b8c09a..1fb5063 100644 +index a855038..df6fc1c 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -56,6 +56,15 @@ diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch index c79c737c62..0d162ebe1b 100644 --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +++ b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch @@ -1,4 +1,4 @@ -From d3dc5f98f653342af97ebfbdf3479ee1f0d0cf38 Mon Sep 17 00:00:00 2001 +From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 May 2019 22:15:03 +0100 Subject: [PATCH] Fix error on musl: diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch index 48fd4d41f3..ec1b927c2e 100644 --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch @@ -1,4 +1,4 @@ -From 9b7554a3e21ccb455b3661a6b4e767636c2c5cf3 Mon Sep 17 00:00:00 2001 +From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror diff --git a/meta/recipes-devtools/elfutils/files/run-ptest b/meta/recipes-devtools/elfutils/files/run-ptest deleted file mode 100644 index 81b81f2f5d..0000000000 --- a/meta/recipes-devtools/elfutils/files/run-ptest +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -#This script is used to run elfutils test suites -cd tests - -make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-, -- 2.20.1