summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-09-15 09:02:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-20 08:57:26 +0100
commit2d44fd92e8025a9ad634c618341a84257d89b718 (patch)
treec80e3d4b42dd479e6683d98d8a2ac17a43c8c71a /meta/recipes-core/util-linux/util-linux
parentfed1504fa00965940c7e2cacc164213c1bd4ef28 (diff)
downloadpoky-2d44fd92e8025a9ad634c618341a84257d89b718.tar.gz
util-linux: Fix lscpu on musl
(From OE-Core rev: 565b22f4927c76b7bbc3d84198a4d5d3927d8401) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch
new file mode 100644
index 0000000000..4d7487c4f7
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch
@@ -0,0 +1,38 @@
1From 95b0405338440cf5cd6d4b2b5c66cda8bf381b28 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Sep 2023 00:18:18 -0700
4Subject: [PATCH] lscpu: Use 4K buffer size instead of BUFSIZ
5
6Some lines in /proc/cpuinfo can be large e.g. flags and can then
7truncate them in displaying them
8
9BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192
10but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g.
11x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags
12line which is greater than 1024 characters and hence this test fails
13on musl because lscpu -s reports truncated string
14
15Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 sys-utils/lscpu-cputype.c | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-)
20
21diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
22index 3fd5f7a3c..c8f72ab8a 100644
23--- a/sys-utils/lscpu-cputype.c
24+++ b/sys-utils/lscpu-cputype.c
25@@ -462,7 +462,9 @@ static int cpuinfo_parse_cache(struct lscpu_cxt *cxt, int keynum, char *data)
26 int lscpu_read_cpuinfo(struct lscpu_cxt *cxt)
27 {
28 FILE *fp;
29- char buf[BUFSIZ];
30+ /* Used to be BUFSIZ which is small on some platforms e.g, musl,
31+ * therefore hardcode to 4K */
32+ char buf[4096];
33 size_t i;
34 struct lscpu_cputype *ct;
35 struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr;
36--
372.42.0
38