* [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184
@ 2021-05-18 1:43 wangmy
2021-05-18 9:40 ` Alexander Kanavin
0 siblings, 1 reply; 3+ messages in thread
From: wangmy @ 2021-05-18 1:43 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
0001-add-support-for-ipkg-to-debuginfod.cxx.patch
removed since it is included in 0.184.
refresh 0001-debuginfod-debuginfod-client.c-correct-string-format.patch
and 0015-config-eu.am-do-not-use-Werror.patch
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../{elfutils_0.183.bb => elfutils_0.184.bb} | 3 +-
...d-support-for-ipkg-to-debuginfod.cxx.patch | 33 ---------------
...infod-client.c-correct-string-format.patch | 40 ++++---------------
.../0015-config-eu.am-do-not-use-Werror.patch | 19 +++++----
4 files changed, 19 insertions(+), 76 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.183.bb => elfutils_0.184.bb} (97%)
delete mode 100644 meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.184.bb
similarity index 97%
rename from meta/recipes-devtools/elfutils/elfutils_0.183.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.184.bb
index 7aebaf1b6d..1726ebc340 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.184.bb
@@ -21,7 +21,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://run-ptest \
file://ptest.patch \
file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
- file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \
file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
"
SRC_URI_append_libc-musl = " \
@@ -30,7 +29,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] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5"
+SRC_URI[sha256sum] = "87e7d1d7f0333815dd1f62135d047a4dc4082068f361452f357997c11360644b"
inherit autotools gettext ptest pkgconfig
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 @@
-From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001
-From: dorindabassey <dorindabassey@gmail.com>
-Date: Sat, 19 Dec 2020 01:11:46 +0100
-Subject: [PATCH] add support for ipkg to debuginfod.cxx
-
-added 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
-
-Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html]
-
-Signed-off-by: dorindabassey <dorindabassey@gmail.com>
-
----
- debuginfod/debuginfod.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index b34eacc..a8915f2 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -484,11 +484,13 @@ parse_opt (int key, char *arg,
- {
- scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
- scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
-+ scan_archives[".ipk"]="dpkg-deb --fsys-tarfile";
- }
- else
- {
- scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<";
- scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<";
-+ scan_archives[".ipk"]="(bsdtar -O -x -f - data.tar.xz)<";
- }
- // .udeb too?
- 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..40ad3163a2 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
@@ -16,15 +16,16 @@ Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
- debuginfod/debuginfod-client.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ debuginfod/debuginfod-client.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
-index de26af5..39e28f2 100644
+index 4fa047f..5afb215 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
-@@ -229,7 +229,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
+@@ -268,7 +268,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
if (fd < 0)
return -errno;
@@ -33,7 +34,7 @@ index de26af5..39e28f2 100644
return -errno;
/* init max age config file. */
-@@ -237,7 +237,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
+@@ -276,7 +276,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
&& (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
return -errno;
@@ -42,33 +43,6 @@ index de26af5..39e28f2 100644
return -errno;
return 0;
-@@ -263,7 +263,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- if (interval_file == NULL)
- return -errno;
-
-- int rc = fprintf(interval_file, "%ld", cache_clean_default_interval_s);
-+ int rc = fprintf(interval_file, "%jd", (intmax_t)cache_clean_default_interval_s);
- fclose(interval_file);
-
- if (rc < 0)
-@@ -275,7 +275,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- interval_file = fopen(interval_path, "r");
- if (interval_file)
- {
-- if (fscanf(interval_file, "%ld", &clean_interval) != 1)
-+ if (fscanf(interval_file, "%jd", (intmax_t*)(&clean_interval)) != 1)
- clean_interval = cache_clean_default_interval_s;
- fclose(interval_file);
- }
-@@ -291,7 +291,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- max_unused_file = fopen(max_unused_path, "r");
- if (max_unused_file)
- {
-- if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1)
-+ if (fscanf(max_unused_file, "%jd", (intmax_t*)(&max_unused_age)) != 1)
- max_unused_age = cache_default_max_unused_age_s;
- fclose(max_unused_file);
- }
--
-2.31.1
+2.25.1
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..753e8a6410 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
@@ -10,28 +10,31 @@ Werror.
Upstream-Status: Inappropriate [oe core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
config/eu.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/config/eu.am b/config/eu.am
-index 6c3c444..3bc0dc9 100644
+index 2c3e457..8fb0411 100644
--- a/config/eu.am
+++ b/config/eu.am
-@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
- -Wold-style-definition -Wstrict-prototypes -Wtrampolines \
+@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
$(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
$(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
- $(if $($(*F)_no_Werror),,-Werror) \
$(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
$(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
-@@ -83,7 +82,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
- -Wtrampolines \
+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
+@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
+ $(TRAMPOLINES_WARNING) \
$(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
$(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
- $(if $($(*F)_no_Werror),,-Werror) \
$(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
$(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
+--
+2.25.1
+
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184
2021-05-18 1:43 [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184 wangmy
@ 2021-05-18 9:40 ` Alexander Kanavin
2021-05-20 8:49 ` wangmy
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Kanavin @ 2021-05-18 9:40 UTC (permalink / raw)
To: wangmy; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]
On Tue, 18 May 2021 at 03:43, wangmy <wangmy@fujitsu.com> wrote:
> -@@ -263,7 +263,7 @@ debuginfod_clean_cache(debuginfod_client *c,
> - if (interval_file == NULL)
> - return -errno;
> -
> -- int rc = fprintf(interval_file, "%ld",
> cache_clean_default_interval_s);
> -+ int rc = fprintf(interval_file, "%jd",
> (intmax_t)cache_clean_default_interval_s);
> - fclose(interval_file);
> -
> - if (rc < 0)
> -@@ -275,7 +275,7 @@ debuginfod_clean_cache(debuginfod_client *c,
> - interval_file = fopen(interval_path, "r");
> - if (interval_file)
> - {
> -- if (fscanf(interval_file, "%ld", &clean_interval) != 1)
> -+ if (fscanf(interval_file, "%jd", (intmax_t*)(&clean_interval)) !=
> 1)
> - clean_interval = cache_clean_default_interval_s;
> - fclose(interval_file);
> - }
> -@@ -291,7 +291,7 @@ debuginfod_clean_cache(debuginfod_client *c,
> - max_unused_file = fopen(max_unused_path, "r");
> - if (max_unused_file)
> - {
> -- if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1)
> -+ if (fscanf(max_unused_file, "%jd", (intmax_t*)(&max_unused_age))
> != 1)
> - max_unused_age = cache_default_max_unused_age_s;
> - fclose(max_unused_file);
> - }
>
I think this cannot be removed, it needs to be rebased (e.g. using 'devtool
upgrade') - the problem is still there, it just moved to different
functions:
https://sourceware.org/git/?p=elfutils.git;a=blob;f=debuginfod/debuginfod-client.c;h=ee7eda24df9f672eb291663cc35fb4b945ad70f5;hb=HEAD#l217
Can you try a x32 build to check please?
Alex
[-- Attachment #2: Type: text/html, Size: 2381 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184
2021-05-18 9:40 ` Alexander Kanavin
@ 2021-05-20 8:49 ` wangmy
0 siblings, 0 replies; 3+ messages in thread
From: wangmy @ 2021-05-20 8:49 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1986 bytes --]
It was compiled in x86 environment and passed.
However, this code cannot be removed.
I have already resubmit this patch.
From: Alexander Kanavin <alex.kanavin@gmail.com>
Sent: Tuesday, May 18, 2021 5:40 PM
To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184
On Tue, 18 May 2021 at 03:43, wangmy <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>> wrote:
-@@ -263,7 +263,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- if (interval_file == NULL)
- return -errno;
-
-- int rc = fprintf(interval_file, "%ld", cache_clean_default_interval_s);
-+ int rc = fprintf(interval_file, "%jd", (intmax_t)cache_clean_default_interval_s);
- fclose(interval_file);
-
- if (rc < 0)
-@@ -275,7 +275,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- interval_file = fopen(interval_path, "r");
- if (interval_file)
- {
-- if (fscanf(interval_file, "%ld", &clean_interval) != 1)
-+ if (fscanf(interval_file, "%jd", (intmax_t*)(&clean_interval)) != 1)
- clean_interval = cache_clean_default_interval_s;
- fclose(interval_file);
- }
-@@ -291,7 +291,7 @@ debuginfod_clean_cache(debuginfod_client *c,
- max_unused_file = fopen(max_unused_path, "r");
- if (max_unused_file)
- {
-- if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1)
-+ if (fscanf(max_unused_file, "%jd", (intmax_t*)(&max_unused_age)) != 1)
- max_unused_age = cache_default_max_unused_age_s;
- fclose(max_unused_file);
- }
I think this cannot be removed, it needs to be rebased (e.g. using 'devtool upgrade') - the problem is still there, it just moved to different functions:
https://sourceware.org/git/?p=elfutils.git;a=blob;f=debuginfod/debuginfod-client.c;h=ee7eda24df9f672eb291663cc35fb4b945ad70f5;hb=HEAD#l217
Can you try a x32 build to check please?
Alex
[-- Attachment #2: Type: text/html, Size: 6764 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-20 8:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-18 1:43 [OE-core] [PATCH] elfutils: upgrade 0.183 -> 0.184 wangmy
2021-05-18 9:40 ` Alexander Kanavin
2021-05-20 8:49 ` wangmy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.