elfutils: correct debuginfod builds on x32
PATCH 1/2 elfutils: correct debuginfod builds on x32
--- .../elfutils/elfutils_0.183.bb | 3 + ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
meta/recipes-devtools/elfutils/elfutils_0.183.bb +3 -0
@@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " +SRC_URI_append_x86-x32 = " \ + file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ + " SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" inherit autotools gettext ptest pkgconfig
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 2/2 elfutils: adjust ptests for correct debuginfod testing
--- meta/recipes-devtools/elfutils/elfutils_0.183.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/elfutils/elfutils_0.183.bb +4 -2
@@ -47,7 +47,7 @@ PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" -RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils" +RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" EXTRA_OECONF_append_class-target = " --disable-tests-rpath"
@@ -89,6 +89,7 @@ do_install_ptest() { cp -r ${B}/tests/* ${D}${PTEST_PATH}/tests cp -r ${B}/config.h ${D}${PTEST_PATH} cp -r ${B}/backends ${D}${PTEST_PATH} + cp -r ${B}/debuginfod ${D}${PTEST_PATH} sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} fi
@@ -145,6 +146,7 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/tests/backtrace-data \ ${PKGD}${PTEST_PATH}/tests/backtrace-dwarf \ ${PKGD}${PTEST_PATH}/tests/deleted \ + ${PKGD}${PTEST_PATH}/tests/dwfllines \ ${PKGD}${PTEST_PATH}/src/strip \ ${PKGD}${PTEST_PATH}/src/addr2line \ ${PKGD}${PTEST_PATH}/src/elfcmp \
@@ -162,4 +164,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \ " -PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1" +PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1"
Signature · 1 line
2.30.2
Quoted 27 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../elfutils/elfutils_0.183.bb | 3 + ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+)create mode 100644
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchmeta/recipes-devtools/elfutils/elfutils_0.183.bb +3
-0@@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " +SRC_URI_append_x86-x32 = " \ + file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ + " SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" inherit autotools gettext ptest pkgconfigmeta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +0
-0
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch line 6
Quoted 6 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +6
-0@@ -0,0 +1,60 @@ +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 19 Apr 2021 23:29:10 +0200 +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on x32 + +Upstream-Status: Inappropriate [x32-specific; few, if any people care about it anymore]
This is worth upstreaming, since 32 bit architectures with 64bit time_t will need.
Quoted 59 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +54
-0+Signed-off-by: Alexander Kanavin <[email protected]> +--- + debuginfod/debuginfod-client.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c +index de26af5..a840f23 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) + if (fd < 0) + return -errno; + +- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) ++ if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) + return -errno; + + /* init max age config file. */ +@@ -237,7 +237,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; + +- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) ++ if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) + 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, "%lld", 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, "%lld", &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, "%lld", &max_unused_age) != 1) + max_unused_age = cache_default_max_unused_age_s; + fclose(max_unused_file); + }
Then the patch needs to guard %lld only for those architectures, and I am not sure how to do that.
Alex
Quoted 114 lines · Khem Raj
Quoted 6 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../elfutils/elfutils_0.183.bb | 3 + ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+)create mode 100644
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchReview
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
meta/recipes-devtools/elfutils/elfutils_0.183.bb SRC_URI_append_libc-musl = " \ · line 33
Quoted 9 lines
index
8b1dece200..a4ea8da32e100644meta/recipes-devtools/elfutils/elfutils_0.183.bb +2
-0@@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " +SRC_URI_append_x86-x32 = " \ +file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
meta/recipes-devtools/elfutils/elfutils_0.183.bb SRC_URI_append_libc-musl = " \ · line 35
Quoted 2 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +1
-0+ " SRC_URI[sha256sum] ="
c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5"Quoted 3 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +0
-0inherit autotools gettext ptest pkgconfigdiff --git
a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchb/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchQuoted 4 lines
new file mode 100644
index 0000000000..a2737b9fe6
---/dev/null
+++
b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchmeta/recipes-devtools/elfutils/elfutils_0.183.bb line 4
Quoted 5 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +4
-0@@ -0,0 +1,60 @@ +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 19 Apr 2021 23:29:10 +0200 +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string formaton x32
meta/recipes-devtools/elfutils/elfutils_0.183.bb line 6
Quoted 2 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +2
-0+ +Upstream-Status: Inappropriate [x32-specific; few, if any people careabout it anymore]
This is worth upstreaming, since 32 bit architectures with 64bit
time_twill need.meta/recipes-devtools/elfutils/elfutils_0.183.bb line 12
Quoted 6 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +6
-0+Signed-off-by: Alexander Kanavin <[email protected]> +--- + debuginfod/debuginfod-client.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/debuginfod/debuginfod-client.c
b/debuginfod/debuginfod-client.cmeta/recipes-devtools/elfutils/elfutils_0.183.bb line 16
Quoted 4 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +4
-0+index de26af5..a840f23 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)meta/recipes-devtools/elfutils/elfutils_0.183.bb line 25
Quoted 9 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +9
-0+ if (fd < 0) + return -errno; + +- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) ++ if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) + return -errno; + + /* init max age config file. */ +@@ -237,7 +237,7 @@ debuginfod_init_cache (char *cache_path, char
*interval_path, char*maxage_path)meta/recipes-devtools/elfutils/elfutils_0.183.bb line 38
Quoted 13 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +13
-0+ && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) + return -errno; + +- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) ++ if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) + 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);meta/recipes-devtools/elfutils/elfutils_0.183.bb line 39
Quoted 1 line
meta/recipes-devtools/elfutils/elfutils_0.183.bb +1
-0++ int rc = fprintf(interval_file, "%lld",
cache_clean_default_interval_s);Quoted 26 lines
meta/recipes-devtools/elfutils/elfutils_0.183.bb +21
-0+ 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, "%lld", &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, "%lld", &max_unused_age) != 1) + max_unused_age = cache_default_max_unused_age_s; + fclose(max_unused_file); + }
Quoted 3 lines · Alexander Kanavin
Then the patch needs to guard %lld only for those architectures, and I am not sure how to do that.
look into using intmax_t type for representing these variables and use %jd in printf formatting string
Quoted 103 lines
Alex
Quoted 100 lines · Khem Raj
Quoted 27 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../elfutils/elfutils_0.183.bb | 3 + ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+)create mode 100644
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchmeta/recipes-devtools/elfutils/elfutils_0.183.bb +3
-0@@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " +SRC_URI_append_x86-x32 = " \ + file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ + " SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" inherit autotools gettext ptest pkgconfigmeta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +0
-0meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch line 6
Quoted 6 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +6
-0@@ -0,0 +1,60 @@ +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 19 Apr 2021 23:29:10 +0200 +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on x32 + +Upstream-Status: Inappropriate [x32-specific; few, if any people care about it anymore]This is worth upstreaming, since 32 bit architectures with 64bit
time_twill need.Quoted 59 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +54
-0+Signed-off-by: Alexander Kanavin <[email protected]> +--- + debuginfod/debuginfod-client.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c +index de26af5..a840f23 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) + if (fd < 0) + return -errno; + +- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) ++ if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) + return -errno; + + /* init max age config file. */ +@@ -237,7 +237,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; + +- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) ++ if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) + 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, "%lld", 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, "%lld", &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, "%lld", &max_unused_age) != 1) + max_unused_age = cache_default_max_unused_age_s; + fclose(max_unused_file); + }
I still see build failures on rv32 see
https://errors.yoctoproject.org/Errors/Details/577160/
Quoted 113 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
Then the patch needs to guard %lld only for those architectures, and I am not sure how to do that.
look into using
intmax_ttype for representing these variables and use %jd in printf formatting stringQuoted 103 lines
Alex
Quoted 100 lines · Khem Raj
Quoted 27 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../elfutils/elfutils_0.183.bb | 3 + ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+)create mode 100644
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patchmeta/recipes-devtools/elfutils/elfutils_0.183.bb +3
-0@@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " +SRC_URI_append_x86-x32 = " \ + file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ + " SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" inherit autotools gettext ptest pkgconfigmeta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +0
-0meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch line 6
Quoted 6 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +6
-0@@ -0,0 +1,60 @@ +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 19 Apr 2021 23:29:10 +0200 +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on x32 + +Upstream-Status: Inappropriate [x32-specific; few, if any people care about it anymore]This is worth upstreaming, since 32 bit architectures with 64bit
time_twill need.Quoted 59 lines
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file +54
-0+Signed-off-by: Alexander Kanavin <[email protected]> +--- + debuginfod/debuginfod-client.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c +index de26af5..a840f23 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) + if (fd < 0) + return -errno; + +- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) ++ if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) + return -errno; + + /* init max age config file. */ +@@ -237,7 +237,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; + +- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) ++ if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) + 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, "%lld", 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, "%lld", &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, "%lld", &max_unused_age) != 1) + max_unused_age = cache_default_max_unused_age_s; + fclose(max_unused_file); + }