* [PATCH 1/2] elfutils: correct debuginfod builds on x32
@ 2021-04-20 12:05 Alexander Kanavin
2021-04-20 12:05 ` [PATCH 2/2] elfutils: adjust ptests for correct debuginfod testing Alexander Kanavin
2021-04-20 15:59 ` [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32 Khem Raj
0 siblings, 2 replies; 6+ messages in thread
From: Alexander Kanavin @ 2021-04-20 12:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../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
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
index 8b1dece200..a4ea8da32e 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
@@ -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
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
new file mode 100644
index 0000000000..a2737b9fe6
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
@@ -0,0 +1,60 @@
+From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+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]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ 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);
+ }
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] elfutils: adjust ptests for correct debuginfod testing
2021-04-20 12:05 [PATCH 1/2] elfutils: correct debuginfod builds on x32 Alexander Kanavin
@ 2021-04-20 12:05 ` Alexander Kanavin
2021-04-20 15:59 ` [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32 Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Alexander Kanavin @ 2021-04-20 12:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/elfutils/elfutils_0.183.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
index a4ea8da32e..dfc3a3fa5b 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
@@ -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"
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32
2021-04-20 12:05 [PATCH 1/2] elfutils: correct debuginfod builds on x32 Alexander Kanavin
2021-04-20 12:05 ` [PATCH 2/2] elfutils: adjust ptests for correct debuginfod testing Alexander Kanavin
@ 2021-04-20 15:59 ` Khem Raj
2021-04-20 17:34 ` Alexander Kanavin
1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2021-04-20 15:59 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On 4/20/21 5:05 AM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> .../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
>
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> index 8b1dece200..a4ea8da32e 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> @@ -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
> 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
> new file mode 100644
> index 0000000000..a2737b9fe6
> --- /dev/null
> +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
> @@ -0,0 +1,60 @@
> +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +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.
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + 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);
> + }
>
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32
2021-04-20 15:59 ` [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32 Khem Raj
@ 2021-04-20 17:34 ` Alexander Kanavin
2021-04-20 20:47 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Alexander Kanavin @ 2021-04-20 17:34 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 4751 bytes --]
Then the patch needs to guard %lld only for those architectures, and I am
not sure how to do that.
Alex
On Tue, 20 Apr 2021 at 17:59, Khem Raj <raj.khem@gmail.com> wrote:
>
>
> On 4/20/21 5:05 AM, Alexander Kanavin wrote:
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > .../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
> >
> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> > index 8b1dece200..a4ea8da32e 100644
> > --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> > @@ -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
> > 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
> > new file mode 100644
> > index 0000000000..a2737b9fe6
> > --- /dev/null
> > +++
> b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
> > @@ -0,0 +1,60 @@
> > +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001
> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
> > +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.
>
> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +---
> > + 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);
> > + }
> >
> >
> >
> >
> >
>
[-- Attachment #2: Type: text/html, Size: 6421 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32
2021-04-20 17:34 ` Alexander Kanavin
@ 2021-04-20 20:47 ` Khem Raj
2021-04-21 15:12 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2021-04-20 20:47 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Tue, Apr 20, 2021 at 10:34 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> 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
> Alex
>
> On Tue, 20 Apr 2021 at 17:59, Khem Raj <raj.khem@gmail.com> wrote:
>>
>>
>>
>> On 4/20/21 5:05 AM, Alexander Kanavin wrote:
>> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > ---
>> > .../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
>> >
>> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
>> > index 8b1dece200..a4ea8da32e 100644
>> > --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
>> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
>> > @@ -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
>> > 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
>> > new file mode 100644
>> > index 0000000000..a2737b9fe6
>> > --- /dev/null
>> > +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
>> > @@ -0,0 +1,60 @@
>> > +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001
>> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> > +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.
>>
>> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > +---
>> > + 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);
>> > + }
>> >
>> >
>> >
>> >
>> >
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32
2021-04-20 20:47 ` Khem Raj
@ 2021-04-21 15:12 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2021-04-21 15:12 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
I still see build failures on rv32 see
https://errors.yoctoproject.org/Errors/Details/577160/
On Tue, Apr 20, 2021 at 1:47 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Tue, Apr 20, 2021 at 10:34 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > 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
>
> > Alex
> >
> > On Tue, 20 Apr 2021 at 17:59, Khem Raj <raj.khem@gmail.com> wrote:
> >>
> >>
> >>
> >> On 4/20/21 5:05 AM, Alexander Kanavin wrote:
> >> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >> > ---
> >> > .../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
> >> >
> >> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> >> > index 8b1dece200..a4ea8da32e 100644
> >> > --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> >> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
> >> > @@ -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
> >> > 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
> >> > new file mode 100644
> >> > index 0000000000..a2737b9fe6
> >> > --- /dev/null
> >> > +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
> >> > @@ -0,0 +1,60 @@
> >> > +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001
> >> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
> >> > +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.
> >>
> >> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >> > +---
> >> > + 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);
> >> > + }
> >> >
> >> >
> >> >
> >> >
> >> >
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-21 15:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-20 12:05 [PATCH 1/2] elfutils: correct debuginfod builds on x32 Alexander Kanavin
2021-04-20 12:05 ` [PATCH 2/2] elfutils: adjust ptests for correct debuginfod testing Alexander Kanavin
2021-04-20 15:59 ` [OE-core] [PATCH 1/2] elfutils: correct debuginfod builds on x32 Khem Raj
2021-04-20 17:34 ` Alexander Kanavin
2021-04-20 20:47 ` Khem Raj
2021-04-21 15:12 ` Khem Raj
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.