mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
elfutils: update patch submitted upstream
As that's what upstream prefers. (From OE-Core rev: 5a6cd9cc1b9d8fd3607f3df311accb483d2989a3) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
190889b8af
commit
1f1f12feca
@@ -21,8 +21,8 @@ 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-debuginfod-debuginfod-client.c-correct-string-format.patch \
|
||||
file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
|
||||
file://0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch \
|
||||
"
|
||||
SRC_URI:append:libc-musl = " \
|
||||
file://0003-musl-utils.patch \
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From 38ddd0d1863f83e8ec545d0160bdf00bbb5569ba 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
|
||||
32bit arches with 64bit time_t
|
||||
|
||||
Use intmax_t to print time_t
|
||||
|
||||
time_t is platform dependent and some of architectures e.g.
|
||||
x32, riscv32, arc use 64bit time_t even while they are 32bit
|
||||
architectures, therefore directly using integer printf formats will not
|
||||
work portably, use intmax_t to typecast time_t into printf family of
|
||||
functions
|
||||
|
||||
Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
|
||||
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@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 c875ee6..df9737d 100644
|
||||
--- a/debuginfod/debuginfod-client.c
|
||||
+++ b/debuginfod/debuginfod-client.c
|
||||
@@ -231,15 +231,15 @@ debuginfod_config_cache(char *config_path,
|
||||
if (fd < 0)
|
||||
return -errno;
|
||||
|
||||
- if (dprintf(fd, "%ld", cache_config_default_s) < 0)
|
||||
+ if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0)
|
||||
return -errno;
|
||||
}
|
||||
|
||||
- long cache_config;
|
||||
+ int cache_config;
|
||||
FILE *config_file = fopen(config_path, "r");
|
||||
if (config_file)
|
||||
{
|
||||
- if (fscanf(config_file, "%ld", &cache_config) != 1)
|
||||
+ if (fscanf(config_file, "%d", &cache_config) != 1)
|
||||
cache_config = cache_config_default_s;
|
||||
fclose(config_file);
|
||||
}
|
||||
@@ -272,7 +272,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, "%jd", (intmax_t)cache_clean_default_interval_s) < 0)
|
||||
return -errno;
|
||||
|
||||
/* init max age config file. */
|
||||
@@ -280,7 +280,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, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
@@ -0,0 +1,45 @@
|
||||
From a0852044907110479d0fb212dda2c5e45af2d3aa Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Thu, 9 Dec 2021 10:43:06 +0100
|
||||
Subject: [PATCH] debuginfod/debuginfod-client.c: use long for cache time
|
||||
configurations
|
||||
|
||||
time_t is platform dependent and some of architectures e.g.
|
||||
x32, riscv32, arc use 64bit time_t even while they are 32bit
|
||||
architectures, therefore directly using integer printf formats will not
|
||||
work portably.
|
||||
|
||||
Use a plain long everywhere as the intervals are small enough
|
||||
that it will not be problematic.
|
||||
|
||||
Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
debuginfod/debuginfod-client.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
|
||||
index c875ee6..11e0fd5 100644
|
||||
--- a/debuginfod/debuginfod-client.c
|
||||
+++ b/debuginfod/debuginfod-client.c
|
||||
@@ -134,17 +134,17 @@ struct debuginfod_client
|
||||
how frequently the cache should be cleaned. The file's st_mtime represents
|
||||
the time of last cleaning. */
|
||||
static const char *cache_clean_interval_filename = "cache_clean_interval_s";
|
||||
-static const time_t cache_clean_default_interval_s = 86400; /* 1 day */
|
||||
+static const long cache_clean_default_interval_s = 86400; /* 1 day */
|
||||
|
||||
/* The cache_miss_default_s within the debuginfod cache specifies how
|
||||
frequently the 000-permision file should be released.*/
|
||||
-static const time_t cache_miss_default_s = 600; /* 10 min */
|
||||
+static const long cache_miss_default_s = 600; /* 10 min */
|
||||
static const char *cache_miss_filename = "cache_miss_s";
|
||||
|
||||
/* The cache_max_unused_age_s file within the debuginfod cache specifies the
|
||||
the maximum time since last access that a file will remain in the cache. */
|
||||
static const char *cache_max_unused_age_filename = "max_unused_age_s";
|
||||
-static const time_t cache_default_max_unused_age_s = 604800; /* 1 week */
|
||||
+static const long cache_default_max_unused_age_s = 604800; /* 1 week */
|
||||
|
||||
/* Location of the cache of files downloaded from debuginfods.
|
||||
The default parent directory is $HOME, or '/' if $HOME doesn't exist. */
|
||||
@@ -1,4 +1,4 @@
|
||||
From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
|
||||
From 8b48c580bae0b0ffc773b0b829c50d33a907853c Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 23 Aug 2019 10:19:48 +0800
|
||||
Subject: [PATCH] musl-utils
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
|
||||
From 5e39da062929a60a07ddfc8b6d435ea65ea3e31f Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 22 Jun 2020 21:35:16 +0000
|
||||
Subject: [PATCH] config/eu.am: do not use -Werror
|
||||
|
||||
Reference in New Issue
Block a user