From e946d5fd62dfa960752e3c54481a9992c2afe403 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Mon, 19 Jun 2023 20:39:54 +0800 Subject: [PATCH 1/2] add ls2k500sfb.ko for loongarch64 --- 0001-add-ls2k500sfb.ko-for-loongarch64.patch | 2 +- lorax-templates-anolis.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/0001-add-ls2k500sfb.ko-for-loongarch64.patch b/0001-add-ls2k500sfb.ko-for-loongarch64.patch index 64aa8eb..fc5da71 100644 --- a/0001-add-ls2k500sfb.ko-for-loongarch64.patch +++ b/0001-add-ls2k500sfb.ko-for-loongarch64.patch @@ -16,7 +16,7 @@ index 61d9310..3c9a782 100644 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 ++removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops fbdev remove lib/modules/*/{build,source,*.map} ## NOTE: depmod gets re-run after cleanup finishes diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 3fe45e7..ea61b7b 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} @@ -55,6 +55,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Fri Jun 16 2023 Wenlong Zhang - 8.3-4.17 +- add ls2k500sfb.ko for loongarch64 + * Fri Jun 16 2023 Wenlong Zhang - 8.3-4.16 - add ls2k500sfb.ko for loongarch64 -- Gitee From 96042430f12032af0198b4f93f37c5949e03e7b4 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Wed, 21 Jun 2023 16:25:47 +0800 Subject: [PATCH 2/2] Fix the problem that boot.iso cannot guide the kernel correctly --- ...ll-iso9660-filenames-for-loongarch64.patch | 25 +++++++++++++++++++ 0001-add-ls2k500sfb.ko-for-loongarch64.patch | 25 ------------------- lorax-templates-anolis.spec | 7 +++--- 3 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 0001-Add-args-full-iso9660-filenames-for-loongarch64.patch delete mode 100644 0001-add-ls2k500sfb.ko-for-loongarch64.patch 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 0000000..e1e664f --- /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 fc5da71..0000000 --- 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 fbdev - 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 ea61b7b..27433eb 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -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,8 +55,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog -* Fri Jun 16 2023 Wenlong Zhang - 8.3-4.17 -- add ls2k500sfb.ko for loongarch64 +* 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 -- Gitee