diff --git a/0001-revert-lscpu-all-size.patch b/0001-revert-lscpu-all-size.patch new file mode 100644 index 0000000000000000000000000000000000000000..28f55b3a0b159665e4524e9aadc61e0c4b85cf2d --- /dev/null +++ b/0001-revert-lscpu-all-size.patch @@ -0,0 +1,30 @@ +From 608ae690c64145530b47182812b2c4bdda954f0b Mon Sep 17 00:00:00 2001 +From: Yangyang Shen +Date: Mon, 29 Jun 2020 14:19:57 +0800 +Subject: [PATCH] revert lscpu all size + +--- + sys-utils/lscpu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c +index 0e77580..2929d0e 100644 +--- a/sys-utils/lscpu.c ++++ b/sys-utils/lscpu.c +@@ -2121,11 +2121,11 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod) + if (get_cache_full_size(desc, ca, &sz) != 0 || sz == 0) + continue; + if (mod->bytes) +- xasprintf(&tmp, "%" PRIu64, sz); ++ xasprintf(&tmp, "%" PRIu64, ca->size); + else + tmp = size_to_human_string( + SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE, +- sz); ++ ca->size); + snprintf(buf, sizeof(buf), _("%s cache:"), ca->name); + add_summary_s(tb, buf, tmp); + free(tmp); +-- +2.23.0 + diff --git a/util-linux.spec b/util-linux.spec index e38723ecef2b3a1563ca1f7bf44f4580f9a5878b..9dc461f95b321be6cf29d3cba2cd57be6c381563 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Name: util-linux Version: 2.34 -Release: 8 +Release: 15 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -40,6 +40,7 @@ Patch0002: libmount-move-already-mounted-code-to-separate-funct.patch Patch0003: libmount-try-read-only-mount-on-write-protected-supe.patch Patch0004: lscpu-Add-HiSilicon-aarch64-tsv110-cpupart.patch Patch0005: lscpu-use-official-name-for-HiSilicon-tsv110.patch +#Patch0006: 0001-revert-lscpu-all-size.patch %description The util-linux package contains a random collection of files that