diff --git a/0001-Add-args-full-iso9660-filenames-for-loongarch64.patch b/0001-Add-args-full-iso9660-filenames-for-loongarch64.patch new file mode 100644 index 0000000000000000000000000000000000000000..e1e664f545420b5548be6a79a54db966174fa1b0 --- /dev/null +++ b/0001-Add-args-full-iso9660-filenames-for-loongarch64.patch @@ -0,0 +1,25 @@ +From 12a2c36ff0c215292fe44e09cb02cd91c182a949 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Wed, 21 Jun 2023 16:17:34 +0800 +Subject: [PATCH] Add args -full-iso9660-filenames for loongarch64 + +--- + 80-anolis/loongarch64.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/80-anolis/loongarch64.tmpl b/80-anolis/loongarch64.tmpl +index 76bb42b..c1a2988 100644 +--- a/80-anolis/loongarch64.tmpl ++++ b/80-anolis/loongarch64.tmpl +@@ -138,7 +138,7 @@ mkdir ${KERNELDIR} + ## make boot.iso + runcmd mkisofs -o ${outroot}/images/boot.iso \ + ${efiargs} -R -J -V '${isolabel}' ${udfargs} \ +- -graft-points \ ++ -graft-points -full-iso9660-filenames \ + ${KERNELDIR}=${outroot}/${KERNELDIR} \ + ${STAGE2IMG}=${outroot}/${STAGE2IMG} \ + ${efigraft} ${filegraft} +-- +2.27.0 + diff --git a/0001-add-ls2k500sfb.ko-for-loongarch64.patch b/0001-add-ls2k500sfb.ko-for-loongarch64.patch deleted file mode 100644 index 64aa8eb25b7082a90a9de019c5d85ef21368397d..0000000000000000000000000000000000000000 --- a/0001-add-ls2k500sfb.ko-for-loongarch64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 75e562331cea3fe90a5d4db80a4175a31ee5f2b5 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Fri, 16 Jun 2023 09:10:09 +0800 -Subject: [PATCH] add ls2k500sfb.ko for loongarch64 - ---- - 80-anolis/runtime-cleanup.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/80-anolis/runtime-cleanup.tmpl b/80-anolis/runtime-cleanup.tmpl -index 61d9310..3c9a782 100644 ---- a/80-anolis/runtime-cleanup.tmpl -+++ b/80-anolis/runtime-cleanup.tmpl -@@ -102,7 +102,7 @@ removekmod sound drivers/media drivers/hwmon \ - removekmod drivers/char --allbut virtio_console hw_random \ - virtio-rng ipmi hmcdrv - removekmod drivers/hid --allbut hid-logitech-dj hid-logitech-hidpp hid-multitouch --removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops -+removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops ls2k500sfb - remove lib/modules/*/{build,source,*.map} - ## NOTE: depmod gets re-run after cleanup finishes - --- -2.27.0 - diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 3fe45e7b265422796f91f4a5b9b9ed6c2f6ed92d..27433eb13d5739fa1056be2a26b29c22bdf46b97 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 16 +%define anolis_release 17 Name: lorax-templates-anolis Version: 8.3 Release: 4.%{anolis_release}%{?dist} @@ -19,7 +19,7 @@ Patch1006: 0001-loongarch-install-different-kernel-for-loongarch.patch Patch1007: 1005-Add-5.10-kmod-pack.patch Patch1008: 0001-add-boot-iso-for-loongarch64.patch Patch1009: 0001-delete-args-T-for-loongarch64.patch -Patch1010: 0001-add-ls2k500sfb.ko-for-loongarch64.patch +Patch1010: 0001-Add-args-full-iso9660-filenames-for-loongarch64.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -55,6 +55,10 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Wed Jun 21 2023 Wenlong Zhang - 8.3-4.17 +- Add args -full-iso9660-filenames for loongarch64 +- delete 0001-add-ls2k500sfb.ko-for-loongarch64.patch + * Fri Jun 16 2023 Wenlong Zhang - 8.3-4.16 - add ls2k500sfb.ko for loongarch64