diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 99ce2a24b0..57f366f6c0 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -35,6 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
35 | file://run-ptest \ | 35 | file://run-ptest \ |
36 | file://display_testname_for_subtest.patch \ | 36 | file://display_testname_for_subtest.patch \ |
37 | file://avoid_parallel_tests.patch \ | 37 | file://avoid_parallel_tests.patch \ |
38 | file://0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \ | ||
38 | " | 39 | " |
39 | 40 | ||
40 | SRC_URI[sha256sum] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" | 41 | SRC_URI[sha256sum] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" |
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 @@ | |||
1 | From 95b0405338440cf5cd6d4b2b5c66cda8bf381b28 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Sep 2023 00:18:18 -0700 | ||
4 | Subject: [PATCH] lscpu: Use 4K buffer size instead of BUFSIZ | ||
5 | |||
6 | Some lines in /proc/cpuinfo can be large e.g. flags and can then | ||
7 | truncate them in displaying them | ||
8 | |||
9 | BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192 | ||
10 | but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g. | ||
11 | x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags | ||
12 | line which is greater than 1024 characters and hence this test fails | ||
13 | on musl because lscpu -s reports truncated string | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492] | ||
16 | Signed-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 | |||
21 | diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c | ||
22 | index 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 | -- | ||
37 | 2.42.0 | ||
38 | |||