From 781871c861bbcebd41e32fa84a32741dfbd593da Mon Sep 17 00:00:00 2001 From: Yingkun Meng Date: Wed, 6 Dec 2023 10:57:04 +0800 Subject: [PATCH] loongarch: Make patches meet specification requirements As described in [1], the ifarch macro is no longer recommanded for use, and the number of architecture related patch should start from 1000. [1] https://gitee.com/openeuler/TC/pulls/71 Signed-off-by: Yingkun Meng --- ...h => 1000-port-Add-LoongArch-support.patch | 0 ...-the-location-where-initrd-is-loaded.patch | 0 ...ongarch-Add-EFI-frame-buffer-support.patch | 0 ...garch-Add-support-for-v4.0-interface.patch | 0 ...support-for-new-EFI-screen-info-GUID.patch | 0 ...-initrd-load-address-64KiB-alignment.patch | 0 ...ment-cache-synchronization-operation.patch | 0 ...rch-Fix-the-initrd-parameter-passing.patch | 0 grub.patches | 26 ++++++------------- 9 files changed, 8 insertions(+), 18 deletions(-) rename port-Add-LoongArch-support.patch => 1000-port-Add-LoongArch-support.patch (100%) rename loongarch-Modify-the-location-where-initrd-is-loaded.patch => 1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch (100%) rename loongarch-Add-EFI-frame-buffer-support.patch => 1002-loongarch-Add-EFI-frame-buffer-support.patch (100%) rename loongarch-Add-support-for-v4.0-interface.patch => 1003-loongarch-Add-support-for-v4.0-interface.patch (100%) rename loongarch-Add-support-for-new-EFI-screen-info-GUID.patch => 1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch (100%) rename loongarch-Force-initrd-load-address-64KiB-alignment.patch => 1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch (100%) rename loongarch-Implement-cache-synchronization-operation.patch => 1006-loongarch-Implement-cache-synchronization-operation.patch (100%) rename loongarch-Fix-the-initrd-parameter-passing.patch => 1007-loongarch-Fix-the-initrd-parameter-passing.patch (100%) diff --git a/port-Add-LoongArch-support.patch b/1000-port-Add-LoongArch-support.patch similarity index 100% rename from port-Add-LoongArch-support.patch rename to 1000-port-Add-LoongArch-support.patch diff --git a/loongarch-Modify-the-location-where-initrd-is-loaded.patch b/1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch similarity index 100% rename from loongarch-Modify-the-location-where-initrd-is-loaded.patch rename to 1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch diff --git a/loongarch-Add-EFI-frame-buffer-support.patch b/1002-loongarch-Add-EFI-frame-buffer-support.patch similarity index 100% rename from loongarch-Add-EFI-frame-buffer-support.patch rename to 1002-loongarch-Add-EFI-frame-buffer-support.patch diff --git a/loongarch-Add-support-for-v4.0-interface.patch b/1003-loongarch-Add-support-for-v4.0-interface.patch similarity index 100% rename from loongarch-Add-support-for-v4.0-interface.patch rename to 1003-loongarch-Add-support-for-v4.0-interface.patch diff --git a/loongarch-Add-support-for-new-EFI-screen-info-GUID.patch b/1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch similarity index 100% rename from loongarch-Add-support-for-new-EFI-screen-info-GUID.patch rename to 1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch diff --git a/loongarch-Force-initrd-load-address-64KiB-alignment.patch b/1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch similarity index 100% rename from loongarch-Force-initrd-load-address-64KiB-alignment.patch rename to 1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch diff --git a/loongarch-Implement-cache-synchronization-operation.patch b/1006-loongarch-Implement-cache-synchronization-operation.patch similarity index 100% rename from loongarch-Implement-cache-synchronization-operation.patch rename to 1006-loongarch-Implement-cache-synchronization-operation.patch diff --git a/loongarch-Fix-the-initrd-parameter-passing.patch b/1007-loongarch-Fix-the-initrd-parameter-passing.patch similarity index 100% rename from loongarch-Fix-the-initrd-parameter-passing.patch rename to 1007-loongarch-Fix-the-initrd-parameter-passing.patch diff --git a/grub.patches b/grub.patches index 87bc09d..72f00c7 100644 --- a/grub.patches +++ b/grub.patches @@ -286,13 +286,9 @@ Patch0286: backport-font-Fix-an-integer-underflow-in-blit_comb.patch Patch0287: backport-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch Patch0288: backport-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch Patch0289: backport-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch -%ifarch loongarch64 -Patch0290: port-Add-LoongArch-support.patch -%endif +Patch0290: 1000-port-Add-LoongArch-support.patch Patch0291: disable-some-unsupported-filesystems.patch -%ifarch loongarch64 -Patch0292: loongarch-Modify-the-location-where-initrd-is-loaded.patch -%endif +Patch0292: 1001-loongarch-Modify-the-location-where-initrd-is-loaded.patch Patch0293: backport-disk-diskfilter-Check-calloc-result-for-NULL.patch Patch0294: backport-kern-buffer-Handle-NULL-input-pointer-in-grub_buffer.patch Patch0295: backport-disk-diskfilter-Don-t-make-a-RAID-array-with-more-th.patch @@ -304,16 +300,12 @@ Patch0300: backport-kern-file-Fix-error-handling-in-grub_file_open.patch Patch0301: backport-fs-xfs-Fix-memory-leaks-in-XFS-module.patch Patch0302: backport-fs-squash4-Fix-memory-leaks-in-grub_squash_iterate_d.patch Patch0303: backport-fs-iso9660-Fix-memory-leaks-in-grub_iso9660_susp_ite.patch -%ifarch loongarch64 -Patch0304: loongarch-Add-EFI-frame-buffer-support.patch -Patch0305: loongarch-Add-support-for-v4.0-interface.patch -Patch0306: loongarch-Add-support-for-new-EFI-screen-info-GUID.patch -%endif +Patch0304: 1002-loongarch-Add-EFI-frame-buffer-support.patch +Patch0305: 1003-loongarch-Add-support-for-v4.0-interface.patch +Patch0306: 1004-loongarch-Add-support-for-new-EFI-screen-info-GUID.patch Patch0307: 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch -%ifarch loongarch64 -Patch0308: loongarch-Force-initrd-load-address-64KiB-alignment.patch -Patch0309: loongarch-Implement-cache-synchronization-operation.patch -%endif +Patch0308: 1005-loongarch-Force-initrd-load-address-64KiB-alignment.patch +Patch0309: 1006-loongarch-Implement-cache-synchronization-operation.patch Patch0310: backport-font-Check-return-value-of-grub_malloc-in-ascii_glyph_lookup.patch Patch0311: backport-font-Assign-null_font-to-unknown_glyph.patch Patch0312: backport-font-Reject-fonts-with-negative-max_char_width-or-max_char_height.patch @@ -331,9 +323,7 @@ Patch0323: Revert-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_C.patch Patch0324: backport-commands-acpi-Use-xsdt_addr-if-present.patch Patch0325: backport-kern-acpi-Use-xsdt_addr-if-present.patch Patch0326: remove-the-items-of-unsupported-filesystems-in-fs.ls.patch -%ifarch loongarch64 -Patch0327: loongarch-Fix-the-initrd-parameter-passing.patch -%endif +Patch0327: 1007-loongarch-Fix-the-initrd-parameter-passing.patch Patch0328: backport-net-dns-Fix-removal-of-DNS-server.patch Patch0329: backport-net-dns-Simplify-error-handling-of-recv_hook-function.patch Patch0330: backport-net-dns-Fix-lookup-error-when-no-IPv6-is-returned.patch