summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-06-04 11:14:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-06 23:16:51 +0100
commitc7b15f642b7a219dde771eee3a07bbe9b6e276d0 (patch)
tree722338ef4030b5d881144ee1dfc7baa285a079e5 /meta/recipes-devtools
parentb76b3e37436344d2dfbab10886af2ecbcb813237 (diff)
downloadpoky-c7b15f642b7a219dde771eee3a07bbe9b6e276d0.tar.gz
elfutils: update 0.183 -> 0.185
0001-add-support-for-ipkg-to-debuginfod.cxx.patch merged upstream. 0001-debuginfod-debuginfod-client.c-correct-string-format.patch rebased. (From OE-Core rev: 466ba2d5c81f817334b2f9242daa8ffca271e224) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.185.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.183.bb)3
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch33
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch61
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-musl-libs.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-musl-utils.patch8
-rw-r--r--meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch16
7 files changed, 42 insertions, 87 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.185.bb
index 7aebaf1b6d..b1ffbc18bf 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.185.bb
@@ -21,7 +21,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
21 file://run-ptest \ 21 file://run-ptest \
22 file://ptest.patch \ 22 file://ptest.patch \
23 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ 23 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
24 file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \
25 file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ 24 file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
26 " 25 "
27SRC_URI_append_libc-musl = " \ 26SRC_URI_append_libc-musl = " \
@@ -30,7 +29,7 @@ SRC_URI_append_libc-musl = " \
30 file://0004-Fix-error-on-musl.patch \ 29 file://0004-Fix-error-on-musl.patch \
31 file://0015-config-eu.am-do-not-use-Werror.patch \ 30 file://0015-config-eu.am-do-not-use-Werror.patch \
32 " 31 "
33SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" 32SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
34 33
35inherit autotools gettext ptest pkgconfig 34inherit autotools gettext ptest pkgconfig
36 35
diff --git a/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch b/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
deleted file mode 100644
index 5f82afef0c..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001
2From: dorindabassey <dorindabassey@gmail.com>
3Date: Sat, 19 Dec 2020 01:11:46 +0100
4Subject: [PATCH] add support for ipkg to debuginfod.cxx
5
6added support for ipkg to the debuginfod scanner. 0.182 only supports RPM and scan .debs, with this patch, debuginfod scanner would be able to scan .ipk
7
8Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html]
9
10Signed-off-by: dorindabassey <dorindabassey@gmail.com>
11
12---
13 debuginfod/debuginfod.cxx | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
17index b34eacc..a8915f2 100644
18--- a/debuginfod/debuginfod.cxx
19+++ b/debuginfod/debuginfod.cxx
20@@ -484,11 +484,13 @@ parse_opt (int key, char *arg,
21 {
22 scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
23 scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
24+ scan_archives[".ipk"]="dpkg-deb --fsys-tarfile";
25 }
26 else
27 {
28 scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<";
29 scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<";
30+ scan_archives[".ipk"]="(bsdtar -O -x -f - data.tar.xz)<";
31 }
32 // .udeb too?
33 break;
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
index 5bd6ba961c..5b225c532d 100644
--- a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
@@ -1,4 +1,4 @@
1From 14dfe84943b8f9e6f504536d8735ef6356210b40 Mon Sep 17 00:00:00 2001 1From c3055ce9eb32d0d24abc5cea5e1d231c499312a7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Apr 2021 23:29:10 +0200 3Date: Mon, 19 Apr 2021 23:29:10 +0200
4Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on 4Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on
@@ -16,15 +16,34 @@ Upstream-Status: Pending
16 16
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18Signed-off-by: Khem Raj <raj.khem@gmail.com> 18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19
19--- 20---
20 debuginfod/debuginfod-client.c | 10 +++++----- 21 debuginfod/debuginfod-client.c | 8 ++++----
21 1 file changed, 5 insertions(+), 5 deletions(-) 22 1 file changed, 4 insertions(+), 4 deletions(-)
22 23
23diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c 24diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
24index de26af5..39e28f2 100644 25index ee7eda2..083ec2c 100644
25--- a/debuginfod/debuginfod-client.c 26--- a/debuginfod/debuginfod-client.c
26+++ b/debuginfod/debuginfod-client.c 27+++ b/debuginfod/debuginfod-client.c
27@@ -229,7 +229,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) 28@@ -226,7 +226,7 @@ debuginfod_config_cache(char *config_path,
29 if (fd < 0)
30 return -errno;
31
32- if (dprintf(fd, "%ld", cache_config_default_s) < 0)
33+ if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0)
34 return -errno;
35 }
36
37@@ -234,7 +234,7 @@ debuginfod_config_cache(char *config_path,
38 FILE *config_file = fopen(config_path, "r");
39 if (config_file)
40 {
41- if (fscanf(config_file, "%ld", &cache_config) != 1)
42+ if (fscanf(config_file, "%jd", (intmax_t*)(&cache_config)) != 1)
43 cache_config = cache_config_default_s;
44 fclose(config_file);
45 }
46@@ -267,7 +267,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
28 if (fd < 0) 47 if (fd < 0)
29 return -errno; 48 return -errno;
30 49
@@ -33,7 +52,7 @@ index de26af5..39e28f2 100644
33 return -errno; 52 return -errno;
34 53
35 /* init max age config file. */ 54 /* init max age config file. */
36@@ -237,7 +237,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) 55@@ -275,7 +275,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
37 && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) 56 && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
38 return -errno; 57 return -errno;
39 58
@@ -42,33 +61,3 @@ index de26af5..39e28f2 100644
42 return -errno; 61 return -errno;
43 62
44 return 0; 63 return 0;
45@@ -263,7 +263,7 @@ debuginfod_clean_cache(debuginfod_client *c,
46 if (interval_file == NULL)
47 return -errno;
48
49- int rc = fprintf(interval_file, "%ld", cache_clean_default_interval_s);
50+ int rc = fprintf(interval_file, "%jd", (intmax_t)cache_clean_default_interval_s);
51 fclose(interval_file);
52
53 if (rc < 0)
54@@ -275,7 +275,7 @@ debuginfod_clean_cache(debuginfod_client *c,
55 interval_file = fopen(interval_path, "r");
56 if (interval_file)
57 {
58- if (fscanf(interval_file, "%ld", &clean_interval) != 1)
59+ if (fscanf(interval_file, "%jd", (intmax_t*)(&clean_interval)) != 1)
60 clean_interval = cache_clean_default_interval_s;
61 fclose(interval_file);
62 }
63@@ -291,7 +291,7 @@ debuginfod_clean_cache(debuginfod_client *c,
64 max_unused_file = fopen(max_unused_path, "r");
65 if (max_unused_file)
66 {
67- if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1)
68+ if (fscanf(max_unused_file, "%jd", (intmax_t*)(&max_unused_age)) != 1)
69 max_unused_age = cache_default_max_unused_age_s;
70 fclose(max_unused_file);
71 }
72--
732.31.1
74
diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
index b373940d37..c7360da7a7 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 @@
1From 18c527991deee93170a887b6da622560d5606913 Mon Sep 17 00:00:00 2001 1From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:18:47 +0800 3Date: Fri, 23 Aug 2019 10:18:47 +0800
4Subject: [PATCH] musl-libs 4Subject: [PATCH] musl-libs
@@ -82,7 +82,7 @@ index ecb4d01..edc85e3 100644
82 #include <stdint.h> 82 #include <stdint.h>
83 83
84diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c 84diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
85index 6edb27f..f331e3c 100644 85index c0f8dfa..aa78033 100644
86--- a/libdwfl/linux-kernel-modules.c 86--- a/libdwfl/linux-kernel-modules.c
87+++ b/libdwfl/linux-kernel-modules.c 87+++ b/libdwfl/linux-kernel-modules.c
88@@ -50,6 +50,7 @@ 88@@ -50,6 +50,7 @@
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index 65593be32f..2e379cdba6 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 @@
1From 2dab1a02a3cfd80629f3e0f380805a5e58dd0ac3 Mon Sep 17 00:00:00 2001 1From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:19:48 +0800 3Date: Fri, 23 Aug 2019 10:19:48 +0800
4Subject: [PATCH] musl-utils 4Subject: [PATCH] musl-utils
@@ -39,7 +39,7 @@ index e117166..8326f6c 100644
39 /* State of -D/-U flags. */ 39 /* State of -D/-U flags. */
40 extern bool arlib_deterministic_output; 40 extern bool arlib_deterministic_output;
41diff --git a/src/elfcompress.c b/src/elfcompress.c 41diff --git a/src/elfcompress.c b/src/elfcompress.c
42index 1b5b1e3..21c9024 100644 42index 2c6d91b..608646e 100644
43--- a/src/elfcompress.c 43--- a/src/elfcompress.c
44+++ b/src/elfcompress.c 44+++ b/src/elfcompress.c
45@@ -37,6 +37,13 @@ 45@@ -37,6 +37,13 @@
@@ -57,7 +57,7 @@ index 1b5b1e3..21c9024 100644
57 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; 57 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
58 58
59diff --git a/src/strip.c b/src/strip.c 59diff --git a/src/strip.c b/src/strip.c
60index 7a5d4e4..81a0d57 100644 60index 70fc8c0..d035d9e 100644
61--- a/src/strip.c 61--- a/src/strip.c
62+++ b/src/strip.c 62+++ b/src/strip.c
63@@ -46,6 +46,13 @@ 63@@ -46,6 +46,13 @@
@@ -75,7 +75,7 @@ index 7a5d4e4..81a0d57 100644
75 75
76 /* Name and version of program. */ 76 /* Name and version of program. */
77diff --git a/src/unstrip.c b/src/unstrip.c 77diff --git a/src/unstrip.c b/src/unstrip.c
78index 8580329..d547487 100644 78index e488e81..0e44456 100644
79--- a/src/unstrip.c 79--- a/src/unstrip.c
80+++ b/src/unstrip.c 80+++ b/src/unstrip.c
81@@ -52,6 +52,15 @@ 81@@ -52,6 +52,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 8e1e97041f..2fa60c333c 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 @@
1From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001 1From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 22:15:03 +0100 3Date: Wed, 1 May 2019 22:15:03 +0100
4Subject: [PATCH] Fix error on musl: 4Subject: [PATCH] Fix error on musl:
@@ -19,7 +19,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
19 1 file changed, 5 insertions(+) 19 1 file changed, 5 insertions(+)
20 20
21diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c 21diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
22index abbdf3f..bd90f4d 100644 22index 197c6a5..3683672 100644
23--- a/tests/elfstrmerge.c 23--- a/tests/elfstrmerge.c
24+++ b/tests/elfstrmerge.c 24+++ b/tests/elfstrmerge.c
25@@ -33,6 +33,11 @@ 25@@ -33,6 +33,11 @@
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 205362626d..5cd6fffc27 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 @@
1From dfe11e043cd8ea0b0f0252bcff9f5a6b98c0ecd3 Mon Sep 17 00:00:00 2001 1From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jun 2020 21:35:16 +0000 3Date: Mon, 22 Jun 2020 21:35:16 +0000
4Subject: [PATCH] config/eu.am: do not use -Werror 4Subject: [PATCH] config/eu.am: do not use -Werror
@@ -16,22 +16,22 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16 1 file changed, 2 deletions(-) 16 1 file changed, 2 deletions(-)
17 17
18diff --git a/config/eu.am b/config/eu.am 18diff --git a/config/eu.am b/config/eu.am
19index 6c3c444..3bc0dc9 100644 19index 2c3e457..8fb0411 100644
20--- a/config/eu.am 20--- a/config/eu.am
21+++ b/config/eu.am 21+++ b/config/eu.am
22@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ 22@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
23 -Wold-style-definition -Wstrict-prototypes -Wtrampolines \ 23 -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
24 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ 24 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
25 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ 25 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
26- $(if $($(*F)_no_Werror),,-Werror) \ 26- $(if $($(*F)_no_Werror),,-Werror) \
27 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ 27 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
28 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ 28 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
29 $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ 29 $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
30@@ -83,7 +82,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ 30@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
31 -Wtrampolines \ 31 $(TRAMPOLINES_WARNING) \
32 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ 32 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
33 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ 33 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
34- $(if $($(*F)_no_Werror),,-Werror) \ 34- $(if $($(*F)_no_Werror),,-Werror) \
35 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ 35 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
36 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ 36 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
37 $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ 37 $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \