From 277c5f3bc5587a648e522b4efb0e2e3b18a14db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Wed, 22 Jan 2025 09:15:22 +0800 Subject: [PATCH] include all patches in the source package. --- anaconda-33.19.sw.patch | 42 ++++++++++++++++------------------------- anaconda.spec | 12 ++++++++---- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/anaconda-33.19.sw.patch b/anaconda-33.19.sw.patch index 9bbb5bd..aefd867 100755 --- a/anaconda-33.19.sw.patch +++ b/anaconda-33.19.sw.patch @@ -1,6 +1,6 @@ -diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/bootloader/factory.py anaconda-33.19.sw/pyanaconda/modules/storage/bootloader/factory.py ---- anaconda-33.19.org/pyanaconda/modules/storage/bootloader/factory.py 2022-09-07 14:50:46.860000000 +0800 -+++ anaconda-33.19.sw/pyanaconda/modules/storage/bootloader/factory.py 2022-09-07 14:50:57.380000000 +0800 +diff -Naur anaconda-36.16.5.org/pyanaconda/modules/storage/bootloader/factory.py anaconda-36.16.5/pyanaconda/modules/storage/bootloader/factory.py +--- anaconda-36.16.5.org/pyanaconda/modules/storage/bootloader/factory.py 2024-12-18 11:01:13.819895361 +0800 ++++ anaconda-36.16.5/pyanaconda/modules/storage/bootloader/factory.py 2024-12-18 11:02:30.091419158 +0800 @@ -106,6 +106,10 @@ platform_class = platform.platform.__class__ @@ -12,9 +12,9 @@ diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/bootloader/factory.py a if platform_class is platform.X86: from pyanaconda.modules.storage.bootloader.grub2 import GRUB2 return GRUB2 -diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/bootloader/grub2.py anaconda-33.19.sw/pyanaconda/modules/storage/bootloader/grub2.py ---- anaconda-33.19.org/pyanaconda/modules/storage/bootloader/grub2.py 2022-09-07 14:50:46.860000000 +0800 -+++ anaconda-33.19.sw/pyanaconda/modules/storage/bootloader/grub2.py 2022-09-07 14:56:42.550000000 +0800 +diff -Naur anaconda-36.16.5.org/pyanaconda/modules/storage/bootloader/grub2.py anaconda-36.16.5/pyanaconda/modules/storage/bootloader/grub2.py +--- anaconda-36.16.5.org/pyanaconda/modules/storage/bootloader/grub2.py 2024-12-18 11:01:13.819895361 +0800 ++++ anaconda-36.16.5/pyanaconda/modules/storage/bootloader/grub2.py 2024-12-18 11:19:34.606201844 +0800 @@ -101,7 +101,7 @@ name = "GRUB2" # grub2 is a virtual provides that's provided by grub2-pc, grub2-ppc64le, @@ -24,7 +24,7 @@ diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/bootloader/grub2.py ana _config_file = "grub.cfg" _config_dir = "grub2" _passwd_file = "user.cfg" -@@ -453,16 +453,47 @@ +@@ -442,16 +442,47 @@ return try: @@ -81,12 +81,12 @@ diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/bootloader/grub2.py ana def check(self): """When installing to the mbr of a disk grub2 needs enough space -diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/platform.py anaconda-33.19.sw/pyanaconda/modules/storage/platform.py ---- anaconda-33.19.org/pyanaconda/modules/storage/platform.py 2022-09-07 14:50:46.850000000 +0800 -+++ anaconda-33.19.sw/pyanaconda/modules/storage/platform.py 2022-09-07 14:50:57.380000000 +0800 -@@ -116,6 +116,17 @@ - selection fails.""" - return self._boot_stage1_missing_error +diff -Naur anaconda-36.16.5.org/pyanaconda/modules/storage/platform.py anaconda-36.16.5/pyanaconda/modules/storage/platform.py +--- anaconda-36.16.5.org/pyanaconda/modules/storage/platform.py 2024-12-18 11:01:13.819895361 +0800 ++++ anaconda-36.16.5/pyanaconda/modules/storage/platform.py 2024-12-18 11:32:14.877052839 +0800 +@@ -138,6 +138,17 @@ + size=Size("1GiB") + ) +class Sw_64(Platform): + _boot_stage1_device_types = ["disk"] @@ -101,8 +101,8 @@ diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/platform.py anaconda-33 + "GPT-formatted disk as an install target.") class X86(Platform): - _boot_stage1_device_types = ["disk"] -@@ -281,6 +292,8 @@ + +@@ -521,6 +532,8 @@ raise SystemError("Unsupported PPC machine type: %s" % ppc_machine) elif arch.is_s390(): return S390() @@ -111,14 +111,4 @@ diff -Nuar anaconda-33.19.org/pyanaconda/modules/storage/platform.py anaconda-33 elif arch.is_efi(): if arch.is_mactel(): return MacEFI() -diff -Nuar anaconda-33.19.org/tests/nosetests/pyanaconda_tests/module_bootloader_test.py anaconda-33.19.sw/tests/nosetests/pyanaconda_tests/module_bootloader_test.py ---- anaconda-33.19.org/tests/nosetests/pyanaconda_tests/module_bootloader_test.py 2022-09-07 14:50:46.610000000 +0800 -+++ anaconda-33.19.sw/tests/nosetests/pyanaconda_tests/module_bootloader_test.py 2022-09-07 14:50:57.130000000 +0800 -@@ -393,6 +393,7 @@ - # Test known platforms. - boot_loader_by_platform = { - platform.X86: GRUB2, -+ platform.Sw_64: GRUB2, - platform.EFI: EFIGRUB, - platform.MacEFI: MacEFIGRUB, - platform.PPC: GRUB2, + diff --git a/anaconda.spec b/anaconda.spec index a9888e3..4ea18ec 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 46 +Release: 47 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,9 +12,7 @@ Source3: hce.conf Source4: disable-disk-encryption.patch Source5: nestos.conf -%ifarch sw_64 -Patch6001: anaconda-33.19.sw.patch -%endif +Patch6001: anaconda-36.16.sw.patch Patch9000: add-passwd-policy.patch Patch9001: bugfix-GUI-nfs-unknown-error.patch @@ -330,6 +328,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jan 22 2025 shenzhongwei - 36.16.5-47 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:include all patches in the source package. + * Thu Jan 16 2025 sunhai - 36.16.5-46 - Type:bugfix - ID:NA -- Gitee