summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-24 09:08:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-25 21:55:10 +0000
commite6f91350d1e2b1dd527a3d25150cb0cd2f24ec82 (patch)
tree0c9a28d3facac796015baf86f8377cc19e876230 /meta/recipes-devtools
parent5185608b6012f8fcf5945a7b3e11b1a22376c0a3 (diff)
downloadpoky-e6f91350d1e2b1dd527a3d25150cb0cd2f24ec82.tar.gz
elfutils: submit patch upstream
(From OE-Core rev: a71a527ecf198e2e3712ed9608b74e78e09ece0f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch21
1 files changed, 11 insertions, 10 deletions
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 5b225c532d..85f22cb395 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 c3055ce9eb32d0d24abc5cea5e1d231c499312a7 Mon Sep 17 00:00:00 2001 1From 38ddd0d1863f83e8ec545d0160bdf00bbb5569ba 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
@@ -12,20 +12,20 @@ architectures, therefore directly using integer printf formats will not
12work portably, use intmax_t to typecast time_t into printf family of 12work portably, use intmax_t to typecast time_t into printf family of
13functions 13functions
14 14
15Upstream-Status: Pending 15Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
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---
21 debuginfod/debuginfod-client.c | 8 ++++---- 21 debuginfod/debuginfod-client.c | 10 +++++-----
22 1 file changed, 4 insertions(+), 4 deletions(-) 22 1 file changed, 5 insertions(+), 5 deletions(-)
23 23
24diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c 24diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
25index ee7eda2..083ec2c 100644 25index c875ee6..df9737d 100644
26--- a/debuginfod/debuginfod-client.c 26--- a/debuginfod/debuginfod-client.c
27+++ b/debuginfod/debuginfod-client.c 27+++ b/debuginfod/debuginfod-client.c
28@@ -226,7 +226,7 @@ debuginfod_config_cache(char *config_path, 28@@ -231,15 +231,15 @@ debuginfod_config_cache(char *config_path,
29 if (fd < 0) 29 if (fd < 0)
30 return -errno; 30 return -errno;
31 31
@@ -34,16 +34,17 @@ index ee7eda2..083ec2c 100644
34 return -errno; 34 return -errno;
35 } 35 }
36 36
37@@ -234,7 +234,7 @@ debuginfod_config_cache(char *config_path, 37- long cache_config;
38+ int cache_config;
38 FILE *config_file = fopen(config_path, "r"); 39 FILE *config_file = fopen(config_path, "r");
39 if (config_file) 40 if (config_file)
40 { 41 {
41- if (fscanf(config_file, "%ld", &cache_config) != 1) 42- if (fscanf(config_file, "%ld", &cache_config) != 1)
42+ if (fscanf(config_file, "%jd", (intmax_t*)(&cache_config)) != 1) 43+ if (fscanf(config_file, "%d", &cache_config) != 1)
43 cache_config = cache_config_default_s; 44 cache_config = cache_config_default_s;
44 fclose(config_file); 45 fclose(config_file);
45 } 46 }
46@@ -267,7 +267,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) 47@@ -272,7 +272,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
47 if (fd < 0) 48 if (fd < 0)
48 return -errno; 49 return -errno;
49 50
@@ -52,7 +53,7 @@ index ee7eda2..083ec2c 100644
52 return -errno; 53 return -errno;
53 54
54 /* init max age config file. */ 55 /* init max age config file. */
55@@ -275,7 +275,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) 56@@ -280,7 +280,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
56 && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) 57 && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
57 return -errno; 58 return -errno;
58 59