From 2fe981add4b2645a0fc6ee94b615cb7932c7104b Mon Sep 17 00:00:00 2001 From: Cupcake Date: Wed, 26 Feb 2025 16:14:56 +0800 Subject: [PATCH] sync community patches --- ...sk-add-new-linux-gpt-partition-types.patch | 55 +++++++++++++++++++ ...port-lscpu-add-riscv-cputype-support.patch | 25 +++++++++ util-linux.spec | 10 +++- 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 backport-libfdisk-add-new-linux-gpt-partition-types.patch create mode 100644 backport-lscpu-add-riscv-cputype-support.patch diff --git a/backport-libfdisk-add-new-linux-gpt-partition-types.patch b/backport-libfdisk-add-new-linux-gpt-partition-types.patch new file mode 100644 index 0000000..6e6549f --- /dev/null +++ b/backport-libfdisk-add-new-linux-gpt-partition-types.patch @@ -0,0 +1,55 @@ +From 216c5c495215d62d77cceaf619a0baf4c9d3ada6 Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 2 Aug 2021 17:55:19 +0800 +Subject: [PATCH] libfdisk: add new Linux GPT partition types + +Add new partition type UUIDs introduced in the following systemd PRs: + +- https://github.com/systemd/systemd/pull/17700 +- https://github.com/systemd/systemd/pull/20087 + +Signed-off-by: WANG Xuerui +--- + include/pt-gpt-partnames.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/include/pt-gpt-partnames.h b/include/pt-gpt-partnames.h +index 6c54a71e3dc..a55a5076799 100644 +--- a/include/pt-gpt-partnames.h ++++ b/include/pt-gpt-partnames.h +@@ -54,6 +54,9 @@ DEF_GUID("4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709", N_("Linux root (x86-64)")), + DEF_GUID("69DAD710-2CE4-4E3C-B16C-21A1D49ABED3", N_("Linux root (ARM)")), + DEF_GUID("B921B045-1DF0-41C3-AF44-4C6F280D3FAE", N_("Linux root (ARM-64)")), + DEF_GUID("993D8D3D-F80E-4225-855A-9DAF8ED7EA97", N_("Linux root (IA-64)")), ++DEF_GUID("77055800-792C-4F94-B39A-98C91B762BB6", N_("Linux root (LoongArch-64)")) ++DEF_GUID("60D5A7FE-8E7D-435C-B714-3DD8162144E1", N_("Linux root (RISC-V-32)")) ++DEF_GUID("72EC70A6-CF74-40E6-BD49-4BDA08E8F224", N_("Linux root (RISC-V-64)")) + DEF_GUID("8DA63339-0007-60C0-C436-083AC8230908", N_("Linux reserved")), + DEF_GUID("933AC7E1-2EB4-4F13-B844-0E14E2AEF915", N_("Linux home")), + DEF_GUID("A19D880F-05FC-4D3B-A006-743F0F84911E", N_("Linux RAID")), +@@ -65,16 +68,25 @@ DEF_GUID("8484680C-9521-48C6-9C11-B0720656F69E", N_("Linux /usr (x86-64)")), + DEF_GUID("7D0359A3-02B3-4F0A-865C-654403E70625", N_("Linux /usr (ARM)")), + DEF_GUID("B0E01050-EE5F-4390-949A-9101B17104E9", N_("Linux /usr (ARM-64)")), + DEF_GUID("4301D2A6-4E3B-4B2A-BB94-9E0B2C4225EA", N_("Linux /usr (IA-64)")), ++DEF_GUID("E611C702-575C-4CBE-9A46-434FA0BF7E3F", N_("Linux /usr (LoongArch-64)")) ++DEF_GUID("B933FB22-5C3F-4F91-AF90-E2BB0FA50702", N_("Linux /usr (RISC-V-32)")) ++DEF_GUID("BEAEC34B-8442-439B-A40B-984381ED097D", N_("Linux /usr (RISC-V-64)")) + DEF_GUID("D13C5D3B-B5D1-422A-B29F-9454FDC89D76", N_("Linux root verity (x86)")), + DEF_GUID("2C7357ED-EBD2-46D9-AEC1-23D437EC2BF5", N_("Linux root verity (x86-64)")), + DEF_GUID("7386CDF2-203C-47A9-A498-F2ECCE45A2D6", N_("Linux root verity (ARM)")), + DEF_GUID("DF3300CE-D69F-4C92-978C-9BFB0F38D820", N_("Linux root verity (ARM-64)")), + DEF_GUID("86ED10D5-B607-45BB-8957-D350F23D0571", N_("Linux root verity (IA-64)")), ++DEF_GUID("F3393B22-E9AF-4613-A948-9D3BFBD0C535", N_("Linux root verity (LoongArch-64)")) ++DEF_GUID("AE0253BE-1167-4007-AC68-43926C14C5DE", N_("Linux root verity (RISC-V-32)")) ++DEF_GUID("B6ED5582-440B-4209-B8DA-5FF7C419EA3D", N_("Linux root verity (RISC-V-64)")) + DEF_GUID("8F461B0D-14EE-4E81-9AA9-049B6FB97ABD", N_("Linux /usr verity (x86)")), + DEF_GUID("77FF5F63-E7B6-4633-ACF4-1565B864C0E6", N_("Linux /usr verity (x86-64)")), + DEF_GUID("C215D751-7BCD-4649-BE90-6627490A4C05", N_("Linux /usr verity (ARM)")), + DEF_GUID("6E11A4E7-FBCA-4DED-B9E9-E1A512BB664E", N_("Linux /usr verity (ARM-64)")), + DEF_GUID("6A491E03-3BE7-4545-8E38-83320E0EA880", N_("Linux /usr verity (IA-64)")), ++DEF_GUID("F46B2C26-59AE-48F0-9106-C50ED47F673D", N_("Linux /usr verity (LoongArch-64)")) ++DEF_GUID("CB1EE4E3-8CD0-4136-A0A4-AA61A32E8730", N_("Linux /usr verity (RISC-V-32)")) ++DEF_GUID("8F1056BE-9B05-47C4-81D6-BE53128E5B54", N_("Linux /usr verity (RISC-V-64)")) + /* ... too crazy, ignore for now: + DEF_GUID("7FFEC5C9-2D00-49B7-8941-3EA10A5586B7", N_("Linux plain dm-crypt")), + DEF_GUID("CA7D7CCB-63ED-4C53-861C-1742536059CC", N_("Linux LUKS")), diff --git a/backport-lscpu-add-riscv-cputype-support.patch b/backport-lscpu-add-riscv-cputype-support.patch new file mode 100644 index 0000000..1343aa5 --- /dev/null +++ b/backport-lscpu-add-riscv-cputype-support.patch @@ -0,0 +1,25 @@ +From f2d35154e52052e315a193900157dc9a0e2f3fb9 Mon Sep 17 00:00:00 2001 +From: Yunhui Cui +Date: Mon, 19 Feb 2024 17:34:17 +0800 +Subject: [PATCH] lscpu: add RISC-V CPUTYPE support + +Only after adding cpu type can print the remaining cpu information, +such as cacheinfo. + +Signed-off-by: Yunhui Cui +--- + sys-utils/lscpu-cputype.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c +index bcdf06e8db0..4ca3d353299 100644 +--- a/sys-utils/lscpu-cputype.c ++++ b/sys-utils/lscpu-cputype.c +@@ -221,6 +221,7 @@ static const struct cpuinfo_pattern type_patterns[] = + DEF_PAT_CPUTYPE( "family", PAT_FAMILY, family), + DEF_PAT_CPUTYPE( "features", PAT_FEATURES, flags), /* s390 */ + DEF_PAT_CPUTYPE( "flags", PAT_FLAGS, flags), /* x86 */ ++ DEF_PAT_CPUTYPE( "hart isa", PAT_ISA, isa), /* riscv */ + DEF_PAT_CPUTYPE( "marchid", PAT_FAMILY, family), /* riscv */ + DEF_PAT_CPUTYPE( "max thread id", PAT_MAX_THREAD_ID, mtid), /* s390 */ + DEF_PAT_CPUTYPE( "mimpid", PAT_MODEL, model), /* riscv */ diff --git a/util-linux.spec b/util-linux.spec index f6227c5..4f850a7 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 16 +Release: 17 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 @@ -93,6 +93,8 @@ Patch6071: backport-lsmem-make-lsmem-to-check-for-the-nodes-more-robust.pat Patch6072: backport-cfdisk-fix-possible-integer-overflow-coverity-scan.patch Patch6073: backport-more-make-sure-we-have-data-on-stderr.patch Patch6074: backport-libblkid-apfs-validate-checksums.patch +Patch6075: backport-libfdisk-add-new-linux-gpt-partition-types.patch +Patch6076: backport-lscpu-add-riscv-cputype-support.patch Patch9000: SKIPPED-no-root-permissions-test.patch Patch9001: util-linux-Add-sw64-architecture.patch @@ -474,6 +476,12 @@ fi %endif %changelog +* Web Feb 26 2025 yuanchicheng - 2.39.1-17 +- Type: bugfix +- CVE: NA +- SUG: NA +- DESC: sync community patches + * Mon Dec 16 2024 yanglongkang - 2.39.1-16 - Type: bugfix - CVE: NA -- Gitee