From b164613de468c8762104bf5c38a3c8c6e927920a Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Tue, 26 Mar 2024 20:35:41 +0800 Subject: [PATCH 01/11] fix lost ntfsprogs --- anaconda.spec | 8 +++++++- euleros.conf | 4 ++++ hce.conf | 4 ++++ nestos.conf | 4 ++++ openeuler.conf | 4 ++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/anaconda.spec b/anaconda.spec index ba45e3a..29b99e2 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 28 +Release: 29 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -312,6 +312,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Mar 26 2024 sunhai - 36.16.5-29 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix lost ntfsprogs + * Thu Feb 29 2024 sunhai - 36.16.5-28 - Type:bugfix - ID:NA diff --git a/euleros.conf b/euleros.conf index fb008b5..8f37a21 100644 --- a/euleros.conf +++ b/euleros.conf @@ -21,6 +21,10 @@ additional_arguments = crash_kexec_post_notifiers softlockup_panic=1 reserve_kbo [Payload] enable_closest_mirror = True +ignored_packages = + ntfsprogs + btrfs-progs + dmraid [Storage] default_partitioning = diff --git a/hce.conf b/hce.conf index 98ea38f..a7d1c7f 100644 --- a/hce.conf +++ b/hce.conf @@ -21,6 +21,10 @@ additional_arguments = crash_kexec_post_notifiers softlockup_panic=1 reserve_kbo [Payload] enable_closest_mirror = True +ignored_packages = + ntfsprogs + btrfs-progs + dmraid [Storage] default_partitioning = diff --git a/nestos.conf b/nestos.conf index c355ad1..8f32e8d 100644 --- a/nestos.conf +++ b/nestos.conf @@ -20,6 +20,10 @@ additional_arguments = cgroup_disable=files apparmor=0 [Payload] enable_closest_mirror = True +ignored_packages = + ntfsprogs + btrfs-progs + dmraid [Storage] default_partitioning = diff --git a/openeuler.conf b/openeuler.conf index 0e356ef..1662996 100644 --- a/openeuler.conf +++ b/openeuler.conf @@ -20,6 +20,10 @@ additional_arguments = cgroup_disable=files apparmor=0 [Payload] enable_closest_mirror = True +ignored_packages = + ntfsprogs + btrfs-progs + dmraid [Storage] default_partitioning = -- Gitee From 9ad1c450ab136d5aa2d7b38e60d08d7b0435143c Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Wed, 3 Apr 2024 11:39:40 +0800 Subject: [PATCH 02/11] ignore nvme-cli --- anaconda.spec | 8 +++++++- euleros.conf | 1 + hce.conf | 1 + nestos.conf | 1 + openeuler.conf | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/anaconda.spec b/anaconda.spec index 29b99e2..42b7177 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 29 +Release: 30 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -312,6 +312,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Apr 03 2024 sunhai - 36.16.5-30 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: ignore nvme-cli + * Tue Mar 26 2024 sunhai - 36.16.5-29 - Type:bugfix - ID:NA diff --git a/euleros.conf b/euleros.conf index 8f37a21..d9b4339 100644 --- a/euleros.conf +++ b/euleros.conf @@ -25,6 +25,7 @@ ignored_packages = ntfsprogs btrfs-progs dmraid + nvme-cli [Storage] default_partitioning = diff --git a/hce.conf b/hce.conf index a7d1c7f..b2f2176 100644 --- a/hce.conf +++ b/hce.conf @@ -25,6 +25,7 @@ ignored_packages = ntfsprogs btrfs-progs dmraid + nvme-cli [Storage] default_partitioning = diff --git a/nestos.conf b/nestos.conf index 8f32e8d..b555391 100644 --- a/nestos.conf +++ b/nestos.conf @@ -24,6 +24,7 @@ ignored_packages = ntfsprogs btrfs-progs dmraid + nvme-cli [Storage] default_partitioning = diff --git a/openeuler.conf b/openeuler.conf index 1662996..99e24bd 100644 --- a/openeuler.conf +++ b/openeuler.conf @@ -24,6 +24,7 @@ ignored_packages = ntfsprogs btrfs-progs dmraid + nvme-cli [Storage] default_partitioning = -- Gitee From 34d55dd4586ef8c078eed345a7d7a2de5675b7bf Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Sat, 20 Apr 2024 16:51:17 +0800 Subject: [PATCH 03/11] sync from 2403-next --- anaconda.spec | 20 +++++++--- bugfix-fix-custom-storage-chinese-tip.patch | 44 +++++++++++++++++++++ euleros.conf | 3 +- fix-hostname-info.patch | 2 +- hce.conf | 3 +- 5 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 bugfix-fix-custom-storage-chinese-tip.patch diff --git a/anaconda.spec b/anaconda.spec index 42b7177..cecbbe6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 30 +Release: 31 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -57,6 +57,7 @@ Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch Patch9025: bugfix-import-new-BlockDev.patch +Patch9026: bugfix-fix-custom-storage-chinese-tip.patch %define dasbusver 1.3 %define dbusver 1.2.3 @@ -85,7 +86,7 @@ BuildRequires: glade-devel libgnomekbd-devel libxklavier-devel >= %{libxklavierv BuildRequires: make BuildRequires: python3-kickstart >= %{pykickstartver} python3-devel systemd BuildRequires: rpm-devel >= %{rpmver} libarchive-devel >= %{libarchivever} gdk-pixbuf2-devel -BuildRequires: libxml2 +BuildRequires: libxml2-devel BuildRequires: gsettings-desktop-schemas metacity Requires: anaconda-core = %{version}-%{release} @@ -312,17 +313,26 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Apr 03 2024 sunhai - 36.16.5-30 +* Sat Apr 20 2024 sunhai - 36.16.5-31 - Type:bugfix - ID:NA - SUG:NA -- DESC: ignore nvme-cli +- DESC: config adjust + revise hostname chinese tip -* Tue Mar 26 2024 sunhai - 36.16.5-29 +* Tue Apr 09 2024 sunhai - 36.16.5-30 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix custom storage chinese tip + +* Tue Apr 09 2024 sunhai - 36.16.5-29 - Type:bugfix - ID:NA - SUG:NA - DESC: fix lost ntfsprogs + fix lost nvme-cli + fix BuildRequires * Thu Feb 29 2024 sunhai - 36.16.5-28 - Type:bugfix diff --git a/bugfix-fix-custom-storage-chinese-tip.patch b/bugfix-fix-custom-storage-chinese-tip.patch new file mode 100644 index 0000000..b209f43 --- /dev/null +++ b/bugfix-fix-custom-storage-chinese-tip.patch @@ -0,0 +1,44 @@ +From 043c6ba5f0e9d97fed947246dfd65f5cfd5d251e Mon Sep 17 00:00:00 2001 +From: s30028044 +Date: Sat, 13 Apr 2024 17:00:13 +0800 +Subject: [PATCH] fix custom storage chinese tip + +--- + po/zh_CN.po | 6 +++--- + pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index ce63959..6a854c7 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1627,10 +1627,10 @@ msgid "" + "'512m' = 512 megabytes\n" + "'123456789' = 123 terabytes and a bit less than a half\n" + msgstr "" +-"请以整数或十进制小数指定期望容量，并带上合适的单位。\n" ++"请使用整数或小数指定所需容量以及可以带上合适的单位。\n" + "\n" +-"不允许以空格分隔的数字组。单位包括十进制前缀或二进制前缀，以及可选的字母 B。" +-"单位对字母的大小写不敏感。如果省略单位，则默认的单位是 MiB。\n" ++"但不允许使用空格将数字分隔成数组。单位由十进制或二进制的计数单位，以及可选字母B组成。" ++"单位会忽略字母大小写，并且缺省单位是 MiB。\n" + "\n" + "有效输入的例子：\n" + "“100GiB” = 100 Gibibytes\n" +diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py +index 81bb793..d374fcf 100644 +--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py ++++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py +@@ -255,7 +255,7 @@ class AddDialog(GUIObject): + self._warning_label = self.builder.get_object("mountPointWarningLabel") + + self._size_entry = self.builder.get_object("addSizeEntry") +- self._size_entry.set_tooltip_text(DESIRED_CAPACITY_HINT) ++ self._size_entry.set_tooltip_text(_(DESIRED_CAPACITY_HINT)) + + self._populate_mount_points() + +-- +2.27.0 + diff --git a/euleros.conf b/euleros.conf index d9b4339..ae8f34d 100644 --- a/euleros.conf +++ b/euleros.conf @@ -6,8 +6,7 @@ profile_id = EulerOS [Profile Detection] # Match os-release values. -os_id = EulerOS -variant_id = server +os_id = euleros [Installation System] can_detect_enabled_smt = False diff --git a/fix-hostname-info.patch b/fix-hostname-info.patch index a217dca..77fecd9 100644 --- a/fix-hostname-info.patch +++ b/fix-hostname-info.patch @@ -24,7 +24,7 @@ index 18b0925..c2216e6 100644 msgstr "" "主机名只能包含 'a-z'、'A-Z'、 '0-9'、 '-'（英文减号），或者 '.'（英文点号），" -"其中两个点号中不能为空且不能以 '-' 开头或结尾。" -+"其中两个点号中不能为空，必须少于64个字符且不能以'.'和'-'开头或结尾。" ++"其中符号不能连接在一起，需用数字或字母隔开，整体长度必须少于64个字符且不能以'.'和'-'开头或结尾。" #: pyanaconda/network.py:457 msgid "Status not available" diff --git a/hce.conf b/hce.conf index b2f2176..e44e30c 100644 --- a/hce.conf +++ b/hce.conf @@ -6,8 +6,7 @@ profile_id = HCE [Profile Detection] # Match os-release values. -os_id = HCE -variant_id = server +os_id = hce [Installation System] can_detect_enabled_smt = False -- Gitee From f98e5f0254d1d5ce5c541df3b1149aa357d53c7c Mon Sep 17 00:00:00 2001 From: Huang Yang Date: Mon, 22 Apr 2024 08:34:56 +0000 Subject: [PATCH 04/11] Fix patch 9025 error on loongarch64 --- 0001-add-loongarch-support-for-anaconda.patch | 18 +++++++++--------- anaconda.spec | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/0001-add-loongarch-support-for-anaconda.patch b/0001-add-loongarch-support-for-anaconda.patch index d6130a1..15d7a8d 100644 --- a/0001-add-loongarch-support-for-anaconda.patch +++ b/0001-add-loongarch-support-for-anaconda.patch @@ -1,6 +1,6 @@ -From b4cffadd1304fc2da30a727b030415168fcf7708 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Mon, 12 Dec 2022 01:37:57 +0000 +From ad79c2e137e801c490fc35d4cecefbca6619fbea Mon Sep 17 00:00:00 2001 +From: Huang Yang +Date: Thu, 25 Apr 2024 12:14:01 +0000 Subject: [PATCH] add loongarch support for anaconda --- @@ -12,7 +12,7 @@ Subject: [PATCH] add loongarch support for anaconda 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py -index 533d528..02ca7ca 100644 +index d40086d..191b8af 100644 --- a/pyanaconda/modules/storage/bootloader/base.py +++ b/pyanaconda/modules/storage/bootloader/base.py @@ -796,11 +796,14 @@ class BootLoader(object): @@ -34,7 +34,7 @@ index 533d528..02ca7ca 100644 # Does /usr have its own device? If so, we need to tell dracut usr_device = storage.mountpoints.get("/usr") diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py -index 1b47e24..99efde6 100644 +index 6135699..96450dc 100644 --- a/pyanaconda/modules/storage/bootloader/efi.py +++ b/pyanaconda/modules/storage/bootloader/efi.py @@ -28,7 +28,7 @@ from pyanaconda.product import productName @@ -46,7 +46,7 @@ index 1b47e24..99efde6 100644 class EFIBase(object): -@@ -203,6 +203,37 @@ class Aarch64EFIGRUB(EFIGRUB): +@@ -169,6 +169,37 @@ class Aarch64EFIGRUB(EFIGRUB): super().__init__() self._packages64 = ["grub2-efi-aa64", "shim-aa64"] @@ -100,11 +100,11 @@ index 8aa3afb..2fb9993 100644 from pyanaconda.modules.storage.bootloader.efi import MacEFIGRUB return MacEFIGRUB diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py -index 0d151d3..26667dd 100644 +index 4db3759..6f85a37 100644 --- a/pyanaconda/modules/storage/devicetree/fsset.py +++ b/pyanaconda/modules/storage/devicetree/fsset.py @@ -23,6 +23,7 @@ import gi - gi.require_version("BlockDev", "2.0") + gi.require_version("BlockDev", "3.0") from gi.repository import BlockDev as blockdev +from blivet import arch @@ -152,5 +152,5 @@ index d0aa7ca..3a238f9 100644 return EFI() elif arch.is_x86(): -- -2.33.0 +2.43.0 diff --git a/anaconda.spec b/anaconda.spec index cecbbe6..1fea1b3 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 31 +Release: 32 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -15,9 +15,6 @@ Source5: nestos.conf %ifarch sw_64 Patch6001: anaconda-33.19.sw.patch %endif -%ifarch loongarch64 -Patch6002: 0001-add-loongarch-support-for-anaconda.patch -%endif Patch9000: add-passwd-policy.patch Patch9001: bugfix-GUI-nfs-unknown-error.patch @@ -59,6 +56,11 @@ Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry Patch9025: bugfix-import-new-BlockDev.patch Patch9026: bugfix-fix-custom-storage-chinese-tip.patch +%ifarch loongarch64 +Patch10000: 0001-add-loongarch-support-for-anaconda.patch +%endif + + %define dasbusver 1.3 %define dbusver 1.2.3 %define dnfver 3.6.0 @@ -313,6 +315,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Apr 22 2024 Huang Yang - 36.16.5-32 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix patch9025 error on loongarch64 + * Sat Apr 20 2024 sunhai - 36.16.5-31 - Type:bugfix - ID:NA -- Gitee From 7fd1e6103d02177a0717e50a1045b655c1cc84e5 Mon Sep 17 00:00:00 2001 From: jchzhou Date: Thu, 9 May 2024 15:47:25 +0800 Subject: [PATCH 05/11] backport a patch for riscv64 enablement from upstream Signed-off-by: jchzhou --- anaconda.spec | 10 +- ...scv64-enablement-patch-from-upstream.patch | 113 ++++++++++++++++++ 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 backport-a-riscv64-enablement-patch-from-upstream.patch diff --git a/anaconda.spec b/anaconda.spec index 1fea1b3..befef22 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 32 +Release: 33 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -50,6 +50,8 @@ Patch9022: bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch Patch6007: backport-Don-t-attempt-to-add-frozen-python-modules-to-initramfs.patch Patch6008: backport-module-setup.sh-Don-t-ignore-errors-unbound-variable-and-pipe-fails.patch Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch +# https://github.com/rhinstaller/anaconda/pull/5198 +Patch6010: backport-a-riscv64-enablement-patch-from-upstream.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch @@ -315,6 +317,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu May 09 2024 jchzhou - 36.16.5-33 +- Type:feature +- ID:NA +- SUG:NA +- DESC: backport a riscv64 enablement patch from upstream + * Mon Apr 22 2024 Huang Yang - 36.16.5-32 - Type:bugfix - ID:NA diff --git a/backport-a-riscv64-enablement-patch-from-upstream.patch b/backport-a-riscv64-enablement-patch-from-upstream.patch new file mode 100644 index 0000000..387f4d0 --- /dev/null +++ b/backport-a-riscv64-enablement-patch-from-upstream.patch @@ -0,0 +1,113 @@ +From: U2FsdGVkX1 +Signed-off-by: Songsong Zhang +Reviewed-by: Wei Fu +Subject: [PATCH] Backport a riscv64 enablement patch from upstream + +Signed-off-by: jchzhou +--- + pyanaconda/modules/storage/bootloader/efi.py | 8 ++++ + .../modules/storage/bootloader/factory.py | 8 ++++ + pyanaconda/modules/storage/platform.py | 38 +++++++++++++++++++ + 3 files changed, 54 insertions(+) + +diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py +index 1b47e24..6743717 100644 +--- a/pyanaconda/modules/storage/bootloader/efi.py ++++ b/pyanaconda/modules/storage/bootloader/efi.py +@@ -214,6 +214,14 @@ class ArmEFIGRUB(EFIGRUB): + self._is_32bit_firmware = True + + ++class RISCV64EFIGRUB(EFIGRUB): ++ _serial_consoles = ["ttyS"] ++ _efi_binary = "\\grubriscv64.efi" ++ ++ def __init__(self): ++ super().__init__() ++ self._packages64 = ["grub2-efi-riscv64"] ++ + class MacEFIGRUB(EFIGRUB): + def __init__(self): + super().__init__() +diff --git a/pyanaconda/modules/storage/bootloader/factory.py b/pyanaconda/modules/storage/bootloader/factory.py +index 8aa3afb..4815685 100644 +--- a/pyanaconda/modules/storage/bootloader/factory.py ++++ b/pyanaconda/modules/storage/bootloader/factory.py +@@ -146,4 +146,12 @@ class BootLoaderFactory(object): + from pyanaconda.modules.storage.bootloader.efi import ArmEFIGRUB + return ArmEFIGRUB + ++ if platform_class is platform.RISCV64: ++ from pyanaconda.modules.storage.bootloader.extlinux import EXTLINUX ++ return EXTLINUX ++ ++ if platform_class is platform.RISCV64EFI: ++ from pyanaconda.modules.storage.bootloader.efi import RISCV64EFIGRUB ++ return RISCV64EFIGRUB ++ + return None +diff --git a/pyanaconda/modules/storage/platform.py b/pyanaconda/modules/storage/platform.py +index d0aa7ca..20f2c4d 100644 +--- a/pyanaconda/modules/storage/platform.py ++++ b/pyanaconda/modules/storage/platform.py +@@ -459,6 +459,40 @@ class ARM(Platform): + } + return dict(super().stage1_constraints, **constraints) + ++class RISCV64(Platform): ++ ++ @property ++ def stage1_suggestion(self): ++ """The platform-specific suggestion about the stage1 device.""" ++ return _( ++ "You must include at least one MBR-formatted " ++ "disk as an install target." ++ ) ++ ++ @property ++ def stage1_descriptions(self): ++ """The platform-specific descriptions of the stage1 device.""" ++ return { ++ "disk": _(MBR_DESCRIPTION), ++ "partition": _(PARTITION_DESCRIPTION) ++ } ++ ++ @property ++ def stage1_constraints(self): ++ """The platform-specific constraints for the stage1 device.""" ++ constraints = { ++ PLATFORM_DEVICE_TYPES: ["disk"] ++ } ++ return dict(super().stage1_constraints, **constraints) ++ ++ ++class RISCV64EFI(EFI): ++ ++ @property ++ def non_linux_format_types(self): ++ """Format types of devices with non-linux operating systems.""" ++ return ["vfat", "ntfs"] ++ + + def get_platform(): + """Check the architecture of the system and return an instance of a +@@ -486,12 +520,16 @@ def get_platform(): + return Aarch64EFI() + elif arch.is_arm(): + return ArmEFI() ++ elif arch.is_riscv64(): ++ return RISCV64EFI() + else: + return EFI() + elif arch.is_x86(): + return X86() + elif arch.is_arm(): + return ARM() ++ elif arch.is_riscv64(): ++ return RISCV64() + else: + raise SystemError("Could not determine system architecture.") + +-- +2.44.0 + -- Gitee From 3ee298c70c7b2b3179911f1c3fb55df7fa97fd6c Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Thu, 23 May 2024 14:10:01 +0800 Subject: [PATCH 06/11] fix patch10000 cannot be applied on loongarch64 --- 0001-add-loongarch-support-for-anaconda.patch | 25 +++++++++++-------- anaconda.spec | 10 +++++--- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/0001-add-loongarch-support-for-anaconda.patch b/0001-add-loongarch-support-for-anaconda.patch index 15d7a8d..a5dfe3f 100644 --- a/0001-add-loongarch-support-for-anaconda.patch +++ b/0001-add-loongarch-support-for-anaconda.patch @@ -3,13 +3,14 @@ From: Huang Yang Date: Thu, 25 Apr 2024 12:14:01 +0000 Subject: [PATCH] add loongarch support for anaconda +Signed-off-by: yueyuankun --- pyanaconda/modules/storage/bootloader/base.py | 9 +++-- - pyanaconda/modules/storage/bootloader/efi.py | 33 ++++++++++++++++++- + pyanaconda/modules/storage/bootloader/efi.py | 35 ++++++++++++++++++- .../modules/storage/bootloader/factory.py | 4 +++ .../modules/storage/devicetree/fsset.py | 6 +++- pyanaconda/modules/storage/platform.py | 10 ++++++ - 5 files changed, 57 insertions(+), 5 deletions(-) + 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py index d40086d..191b8af 100644 @@ -34,7 +35,7 @@ index d40086d..191b8af 100644 # Does /usr have its own device? If so, we need to tell dracut usr_device = storage.mountpoints.get("/usr") diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py -index 6135699..96450dc 100644 +index 5a28676..d2fffd2 100644 --- a/pyanaconda/modules/storage/bootloader/efi.py +++ b/pyanaconda/modules/storage/bootloader/efi.py @@ -28,7 +28,7 @@ from pyanaconda.product import productName @@ -46,10 +47,10 @@ index 6135699..96450dc 100644 class EFIBase(object): -@@ -169,6 +169,37 @@ class Aarch64EFIGRUB(EFIGRUB): - super().__init__() +@@ -170,6 +170,39 @@ class Aarch64EFIGRUB(EFIGRUB): self._packages64 = ["grub2-efi-aa64", "shim-aa64"] + +class LOONGARCHEFIGRUB(EFIGRUB): + _efi_binary = "grubloongarch64.efi" + stage2_is_valid_stage1 = False @@ -81,11 +82,13 @@ index 6135699..96450dc 100644 + elif self.stage1_device.type == "mdarray": # pylint: disable=no-member + for parent in self.stage1_device.parents: # pylint: disable=no-member + self._add_single_efi_boot_target(parent) - ++ ++ class ArmEFIGRUB(EFIGRUB): _serial_consoles = ["ttyAMA", "ttyS"] + _efi_binary = "\\grubarm.efi" diff --git a/pyanaconda/modules/storage/bootloader/factory.py b/pyanaconda/modules/storage/bootloader/factory.py -index 8aa3afb..2fb9993 100644 +index 4815685..643f633 100644 --- a/pyanaconda/modules/storage/bootloader/factory.py +++ b/pyanaconda/modules/storage/bootloader/factory.py @@ -114,6 +114,10 @@ class BootLoaderFactory(object): @@ -124,7 +127,7 @@ index 4db3759..6f85a37 100644 if device.format.check and mountpoint == "/": passno = 1 diff --git a/pyanaconda/modules/storage/platform.py b/pyanaconda/modules/storage/platform.py -index d0aa7ca..3a238f9 100644 +index 20f2c4d..2bb8e41 100644 --- a/pyanaconda/modules/storage/platform.py +++ b/pyanaconda/modules/storage/platform.py @@ -287,6 +287,14 @@ class Aarch64EFI(EFI): @@ -142,10 +145,10 @@ index d0aa7ca..3a238f9 100644 class ArmEFI(EFI): @property -@@ -486,6 +494,8 @@ def get_platform(): - return Aarch64EFI() - elif arch.is_arm(): +@@ -522,6 +530,8 @@ def get_platform(): return ArmEFI() + elif arch.is_riscv64(): + return RISCV64EFI() + elif arch.is_loongarch(): + return LOONGARCHEFI() else: diff --git a/anaconda.spec b/anaconda.spec index befef22..a8f0f9d 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 33 +Release: 34 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -58,9 +58,7 @@ Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry Patch9025: bugfix-import-new-BlockDev.patch Patch9026: bugfix-fix-custom-storage-chinese-tip.patch -%ifarch loongarch64 Patch10000: 0001-add-loongarch-support-for-anaconda.patch -%endif %define dasbusver 1.3 @@ -317,6 +315,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu May 23 2024 yueyuankun - 36.16.5-34 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix patch10000 cannot be applied on loongarch64 + * Thu May 09 2024 jchzhou - 36.16.5-33 - Type:feature - ID:NA -- Gitee From 6d976f1dd18c9ec6dc3691d654298317d747358a Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Wed, 19 Jun 2024 17:27:18 +0800 Subject: [PATCH 07/11] Don't unnecessarily use cat and use grep -E --- anaconda.spec | 10 ++++++- ...unnecessarily-use-cat-and-use-grep-E.patch | 30 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch diff --git a/anaconda.spec b/anaconda.spec index a8f0f9d..c1ec70e 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 34 +Release: 35 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -52,6 +52,8 @@ Patch6008: backport-module-setup.sh-Don-t-ignore-errors-unbound-variable-and- Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch # https://github.com/rhinstaller/anaconda/pull/5198 Patch6010: backport-a-riscv64-enablement-patch-from-upstream.patch +# https://github.com/rhinstaller/anaconda/pull/3984 +Patch6011: backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch @@ -315,6 +317,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jun 19 2024 yueyuankun - 36.16.5-35 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix(anaconda-pre-log-gen): don't unnecessarily use cat and use grep -E + * Thu May 23 2024 yueyuankun - 36.16.5-34 - Type:bugfix - ID:NA diff --git a/backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch b/backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch new file mode 100644 index 0000000..7ba71f5 --- /dev/null +++ b/backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch @@ -0,0 +1,30 @@ +From ab9b2f98134d99325ac468a7c01ed0e659464f3d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= +Date: Sat, 26 Mar 2022 18:32:17 +0000 +Subject: [PATCH] Don't unnecessarily use cat and use grep -E + +--- + scripts/anaconda-pre-log-gen | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/scripts/anaconda-pre-log-gen b/scripts/anaconda-pre-log-gen +index 30eacc8a3c..0012e076db 100755 +--- a/scripts/anaconda-pre-log-gen ++++ b/scripts/anaconda-pre-log-gen +@@ -5,12 +5,8 @@ + # where the resulting logs will be stored + TARGET_DIRECTORY=/tmp/pre-anaconda-logs + +-BOOT_OPTIONS_FILE=/proc/cmdline +- +-DEBUG_ENABLED=`cat $BOOT_OPTIONS_FILE | egrep -c "\|\"` +- + # do not produce any logs unless debug is enabled +-[ $DEBUG_ENABLED == '0' ] && exit 0 ++grep -E -q "\|\" /proc/cmdline || exit 0 + + mkdir ${TARGET_DIRECTORY} + +-- +2.33.0 + -- Gitee From 38f31603b39b849d414885f53065afecef4d087f Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Sat, 22 Jun 2024 18:34:15 +0800 Subject: [PATCH 08/11] adjust some requires and config for derived os --- anaconda.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index c1ec70e..84b86f6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 35 +Release: 36 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -96,7 +96,7 @@ BuildRequires: gsettings-desktop-schemas metacity Requires: anaconda-core = %{version}-%{release} Requires: anaconda-tui = %{version}-%{release} Requires: libblockdev-plugins-all >= %{libblockdevver} realmd isomd5sum >= %{isomd5sumver} -Requires: kexec-tools createrepo_c tmux gdb rsync python3-meh-gui >= %{mehver} +Requires: kexec-tools createrepo_c tmux rsync python3-meh-gui >= %{mehver} Requires: adwaita-icon-theme python3-kickstart Requires: tigervnc-server-minimal libxklavier >= %{libxklavierver} libgnomekbd Requires: nm-connection-editor keybinder3 system-logos @@ -126,11 +126,10 @@ Requires: python3-pyparted >= %{pypartedver} python3-requests python3-requests-f Requires: python3-requests-ftp python3-kickstart >= %{pykickstartver} Requires: python3-langtable >= %{langtablever} util-linux >= %{utillinuxver} python3-gobject-base Requires: python3-dbus python3-pwquality python3-systemd python3-dasbus >= %{dasbusver} -Requires: python3-packaging Requires: cracklib-dicts python3-pytz teamd NetworkManager >= %{nmver} NetworkManager-libnm >= %{nmver} -Requires: NetworkManager-team kbd chrony systemd python3-pid +Requires: kbd chrony systemd python3-pid Requires: python3-ordered-set >= 2.0.0 glibc-langpack-en dbus-daemon -Requires: systemd-resolved +Recommends: python3-packaging NetworkManager-team systemd-resolved # Required by the systemd service anaconda-fips. Requires: crypto-policies Requires: /usr/bin/update-crypto-policies @@ -206,8 +205,8 @@ cp %{SOURCE5} %{SOURCE5}_tmp # install openEuler conf for anaconda %ifarch x86_64 sed -i "/^additional_arguments =*/ s/$/ crashkernel=512M/" %{SOURCE1} -sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1/" %{SOURCE2} -sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1/" %{SOURCE3} +sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1 quiet/" %{SOURCE2} +sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1 quiet/" %{SOURCE3} sed -i "/^additional_arguments =*/ s/$/ crashkernel=512M/" %{SOURCE5} %endif @@ -317,6 +316,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Sat Jun 22 2024 sunhai - 36.16.5-36 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: adjust some requires and config for derived os + * Wed Jun 19 2024 yueyuankun - 36.16.5-35 - Type:bugfix - ID:NA -- Gitee From 607ed5fb8c0763e500a9563209b9875f5149b375 Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Wed, 26 Jun 2024 11:34:57 +0800 Subject: [PATCH 09/11] fix encypt shield --- anaconda.spec | 8 ++++- ...nge-root-and-storage-interface-shows.patch | 2 +- disable-disk-encryption.patch | 29 ++++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index 84b86f6..9e9b3ce 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 36 +Release: 37 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -316,6 +316,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jun 26 2024 sunhai - 36.16.5-37 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix encypt shield + * Sat Jun 22 2024 sunhai - 36.16.5-36 - Type:bugfix - ID:NA diff --git a/bugfix-change-root-and-storage-interface-shows.patch b/bugfix-change-root-and-storage-interface-shows.patch index 09eba94..00cc6be 100644 --- a/bugfix-change-root-and-storage-interface-shows.patch +++ b/bugfix-change-root-and-storage-interface-shows.patch @@ -113,8 +113,8 @@ index 3a75565..b9344da 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -544,7 +544,7 @@ class CreateNewPage(BasePage): + use_underline=True ) - self._createBox.attach(label, 0, 6, 2, 1) - checkbox = Gtk.CheckButton(label="Encrypt my data.") + checkbox = Gtk.CheckButton(label=_("Encrypt my data.")) diff --git a/disable-disk-encryption.patch b/disable-disk-encryption.patch index bdddea0..b069316 100644 --- a/disable-disk-encryption.patch +++ b/disable-disk-encryption.patch @@ -4,15 +4,16 @@ Date: Wed, 16 Sep 2020 15:28:39 +0800 Subject: [PATCH] disable disk encryption --- - pyanaconda/ui/gui/spokes/custom_storage.py | 8 ++++---- + pyanaconda/ui/gui/spokes/custom_storage.py | 9 +++++---- + pyanaconda/ui/gui/spokes/lib/accordion.py | 2 -- pyanaconda/ui/gui/spokes/storage.py | 7 ++++--- - 2 files changed, 8 insertions(+), 7 deletions(-) + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py index 347a0e0..d72e315 100644 --- a/pyanaconda/ui/gui/spokes/custom_storage.py +++ b/pyanaconda/ui/gui/spokes/custom_storage.py -@@ -796,8 +796,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler): +@@ -796,8 +796,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler): fancy_set_sensitive(self._reformatCheckbox, self._permissions.reformat) # Set up the encryption. @@ -20,6 +21,7 @@ index 347a0e0..d72e315 100644 - fancy_set_sensitive(self._encryptCheckbox, self._permissions.device_encrypted) + self._encryptCheckbox.set_active(False) + fancy_set_sensitive(self._encryptCheckbox, False) ++ self._encryptCheckbox.set_visible(False) self._encryptCheckbox.set_inconsistent(self._request.container_encrypted) text = _("The container is encrypted.") if self._request.container_encrypted else "" @@ -41,6 +43,25 @@ index 347a0e0..d72e315 100644 self._update_luks_combo() fancy_set_sensitive(self._fsCombo, self._permissions.format_type) self.on_value_changed() +diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py +index b9344da..235890f 100644 +--- a/pyanaconda/ui/gui/spokes/lib/accordion.py ++++ b/pyanaconda/ui/gui/spokes/lib/accordion.py +@@ -542,7 +542,6 @@ class CreateNewPage(BasePage): + wrap=True, + use_underline=True + ) +- self._createBox.attach(label, 0, 6, 2, 1) + + checkbox = Gtk.CheckButton(label="Encrypt my data.") + checkbox.connect("toggled", encrypted_changed_cb) +@@ -552,6 +551,5 @@ class CreateNewPage(BasePage): + checkbox.set_hexpand(False) + + label.set_mnemonic_widget(checkbox) +- self._createBox.attach(checkbox, 0, 7, 2, 1) + + self.add(self._createBox) diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 9494d6a..b2c0d3e 100644 --- a/pyanaconda/ui/gui/spokes/storage.py @@ -67,5 +88,5 @@ index 9494d6a..b2c0d3e 100644 # Hide the reclaim space checkbox if automatic storage configuration is not used. self._reclaim_revealer.set_reveal_child( -- -1.8.3.1 +2.27.0 -- Gitee From fc29aad6c55481b5a61061b4e1f6b9a9275fb627 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Tue, 20 Aug 2024 16:26:52 +0800 Subject: [PATCH 10/11] check that the password contains the username (cherry picked from commit 6f807938cddf9a2be9988bf248a69c17d7177a91) --- ...t-the-password-contains-the-username.patch | 81 +++++++++++++++++++ anaconda.spec | 13 ++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 0001-check-that-the-password-contains-the-username.patch diff --git a/0001-check-that-the-password-contains-the-username.patch b/0001-check-that-the-password-contains-the-username.patch new file mode 100644 index 0000000..bc50e77 --- /dev/null +++ b/0001-check-that-the-password-contains-the-username.patch @@ -0,0 +1,81 @@ +From f5882812416bf30f840b1c683ad8f4bac459a82d Mon Sep 17 00:00:00 2001 +From: songmingliang +Date: Tue, 20 Aug 2024 16:04:58 +0800 +Subject: [PATCH] check that the password contains the username + +--- + pyanaconda/ui/gui/spokes/root_password.py | 2 ++ + pyanaconda/ui/tui/spokes/root_password.py | 1 + + pyanaconda/ui/tui/spokes/user.py | 1 + + pyanaconda/ui/tui/tuiobject.py | 11 +++++++++++ + 4 files changed, 15 insertions(+) + +diff --git a/pyanaconda/ui/gui/spokes/root_password.py b/pyanaconda/ui/gui/spokes/root_password.py +index a9157ab..90eda48 100644 +--- a/pyanaconda/ui/gui/spokes/root_password.py ++++ b/pyanaconda/ui/gui/spokes/root_password.py +@@ -101,6 +101,8 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler) + initial_password_confirmation_content=self.password_confirmation, + policy_name=PASSWORD_POLICY_ROOT + ) ++ # configure root username for checking ++ self.checker.username = "root" + # configure the checker for password checking + self.checker.secret_type = constants.SecretType.PASSWORD + # remove any placeholder texts if either password or confirmation field changes content from initial state +diff --git a/pyanaconda/ui/tui/spokes/root_password.py b/pyanaconda/ui/tui/spokes/root_password.py +index dfaca4e..2dc39c0 100644 +--- a/pyanaconda/ui/tui/spokes/root_password.py ++++ b/pyanaconda/ui/tui/spokes/root_password.py +@@ -151,6 +151,7 @@ class RootPasswordSpoke(NormalTUISpoke): + func_args=(algo,) + ) + password_dialog.no_separator = True ++ password_dialog.username = "root" + self._password = password_dialog.run() + + if self._password is None: +diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py +index a107063..e914c1c 100644 +--- a/pyanaconda/ui/tui/spokes/user.py ++++ b/pyanaconda/ui/tui/spokes/user.py +@@ -148,6 +148,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalTUISpoke): + title=_("Password"), + policy_name=PASSWORD_POLICY_USER + ) ++ password_dialog.username = self.user.name + if self.user.password: + entry = EntryWidget(password_dialog.title, _(PASSWORD_SET)) + else: +diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py +index c642931..5a7f9a0 100644 +--- a/pyanaconda/ui/tui/tuiobject.py ++++ b/pyanaconda/ui/tui/tuiobject.py +@@ -218,6 +218,15 @@ class PasswordDialog(Dialog): + self._process_password = process_func + self._func_args = func_args + self._dialog_message = message ++ self._username = "" ++ ++ @property ++ def username(self): ++ return self._username ++ ++ @username.setter ++ def username(self, new_username): ++ self._username = new_username + + def run(self): + """Get password input from user and call setter callback at the end. +@@ -259,6 +268,8 @@ class PasswordDialog(Dialog): + password_check_request.password = password + password_check_request.password_confirmation = "" + password_check_request.policy = self._policy ++ # configure username for checking ++ password_check_request.username = self.username + + # validate the password + password_check = input_checking.PasswordValidityCheck() +-- +2.27.0 + diff --git a/anaconda.spec b/anaconda.spec index 9e9b3ce..fb00622 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 37 +Release: 38 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -61,6 +61,8 @@ Patch9025: bugfix-import-new-BlockDev.patch Patch9026: bugfix-fix-custom-storage-chinese-tip.patch Patch10000: 0001-add-loongarch-support-for-anaconda.patch +# https://github.com/rhinstaller/anaconda/pull/4235 +Patch10001: 0001-check-that-the-password-contains-the-username.patch %define dasbusver 1.3 @@ -316,6 +318,15 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Aug 20 2024 songmingliang - 36.16.5-38 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix the root user creation GTK GUI not checking if a password + contains the user name. + Fix the non-root user creation Text UI not checking if a password + contains the user name. + * Wed Jun 26 2024 sunhai - 36.16.5-37 - Type:bugfix - ID:NA -- Gitee From 42963bb93b76de330d3312f1e4a5e3f1d04f1c1d Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Thu, 7 Nov 2024 10:03:14 +0800 Subject: [PATCH 11/11] backport upstream patches, fix displaying of the device label --- anaconda.spec | 10 ++++- ...i-Fix-displaying-of-the-device-label.patch | 39 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 backport-gui-Fix-displaying-of-the-device-label.patch diff --git a/anaconda.spec b/anaconda.spec index fb00622..ab8708a 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 38 +Release: 39 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -54,6 +54,8 @@ Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch Patch6010: backport-a-riscv64-enablement-patch-from-upstream.patch # https://github.com/rhinstaller/anaconda/pull/3984 Patch6011: backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch +# https://github.com/rhinstaller/anaconda/pull/5555 +Patch6012: backport-gui-Fix-displaying-of-the-device-label.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch @@ -318,6 +320,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Sun Oct 13 2024 yueyuankun - 36.16.5-39 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: GUI: Correctly display device label + * Tue Aug 20 2024 songmingliang - 36.16.5-38 - Type:bugfix - ID:NA diff --git a/backport-gui-Fix-displaying-of-the-device-label.patch b/backport-gui-Fix-displaying-of-the-device-label.patch new file mode 100644 index 0000000..42e92e4 --- /dev/null +++ b/backport-gui-Fix-displaying-of-the-device-label.patch @@ -0,0 +1,39 @@ +From 7d771b57a7d876d86d0763550664eee1b2c3f94c Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Fri, 12 Apr 2024 18:08:58 +0800 +Subject: [PATCH] gui: Fix displaying of the device label + +Signed-off-by: yueyuankun +--- + pyanaconda/ui/gui/spokes/installation_source.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py +index 5b55792..fd2d67f 100644 +--- a/pyanaconda/ui/gui/spokes/installation_source.py ++++ b/pyanaconda/ui/gui/spokes/installation_source.py +@@ -56,7 +56,7 @@ from pyanaconda.core.configuration.anaconda import conf + from pyanaconda.core.regexes import REPO_NAME_VALID, URL_PARSE, HOSTNAME_PATTERN_WITHOUT_ANCHORS + from pyanaconda.modules.common.constants.services import NETWORK, STORAGE + from pyanaconda.modules.common.constants.objects import DEVICE_TREE +-from pyanaconda.modules.common.structures.storage import DeviceData ++from pyanaconda.modules.common.structures.storage import DeviceFormatData + from pyanaconda.modules.common.util import is_module_available + from pyanaconda.core.storage import device_matches + +@@ -911,10 +911,10 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): + self.initialize_done() + + def _show_autodetect_box_with_device(self, device_name): +- device_data = DeviceData.from_structure( +- self._device_tree.GetDeviceData(device_name) ++ device_format_data = DeviceFormatData.from_structure( ++ self._device_tree.GetFormatData(device_name) + ) +- device_label = device_data.attrs.get("label", "") ++ device_label = device_format_data.attrs.get("label", "") + self._show_autodetect_box(device_name, device_label) + + def _show_autodetect_box(self, device_name, device_label): +-- +2.43.0 -- Gitee