From bc0c4576049b902747e811594ef0e89955bd7bcb Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 24 Feb 2022 17:34:11 +0800 Subject: [PATCH] tmpl: pass kernels for aarch64 efi Signed-off-by: Liwei Ge --- ...-tmpl-update-kernels-for-aarch64-efi.patch | 69 +++++++++++++++++++ lorax-templates-anolis.spec | 7 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 1003-tmpl-update-kernels-for-aarch64-efi.patch diff --git a/1003-tmpl-update-kernels-for-aarch64-efi.patch b/1003-tmpl-update-kernels-for-aarch64-efi.patch new file mode 100644 index 0000000..1035ad0 --- /dev/null +++ b/1003-tmpl-update-kernels-for-aarch64-efi.patch @@ -0,0 +1,69 @@ +diff -Nur lorax-templates-anolis-8.3.orig/80-anolis/aarch64.tmpl lorax-templates-anolis-8.3.new/80-anolis/aarch64.tmpl +--- lorax-templates-anolis-8.3.orig/80-anolis/aarch64.tmpl 2022-02-24 14:37:45.518571979 +0800 ++++ lorax-templates-anolis-8.3.new/80-anolis/aarch64.tmpl 2022-02-24 19:27:49.669396630 +0800 +@@ -49,7 +49,7 @@ + %> + treeinfo images-${basearch} ${img|basename} ${img} + %endfor +- <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> ++ <%include file="efi.tmpl" args="kernels=kernels, configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> + %endif + + # Create optional product.img and updates.img +diff -Nur lorax-templates-anolis-8.3.orig/80-anolis/config_files/aarch64/grub2-efi.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub2-efi.cfg +--- lorax-templates-anolis-8.3.orig/80-anolis/config_files/aarch64/grub2-efi.cfg 2020-07-08 06:26:52.000000000 +0800 ++++ lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub2-efi.cfg 2022-02-24 19:27:38.354374629 +0800 +@@ -27,20 +27,24 @@ + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro +- initrd @INITRDPATH@ ++ linux @ANCKKERNELPATH@ @ROOT@ ro ++ initrd @ANCKINITRDPATH@ ++} ++menuentry 'Install @PRODUCT@ @VERSION@ in compatible mode' --class red --class gnu-linux --class gnu --class os { ++ linuxefi @RHCKKERNELPATH@ @ROOT@ quiet ++ initrdefi @RHCKINITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check +- initrd @INITRDPATH@ ++ linux @ANCKKERNELPATH@ @ROOT@ rd.live.check ++ initrd @ANCKINITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset +- initrd @INITRDPATH@ ++ linux @ANCKKERNELPATH@ @ROOT@ nomodeset ++ initrd @ANCKINITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rescue +- initrd @INITRDPATH@ ++ linux @ANCKKERNELPATH@ @ROOT@ rescue ++ initrd @ANCKINITRDPATH@ + } + } +diff -Nur lorax-templates-anolis-8.3.orig/80-anolis/config_files/aarch64/grub.conf lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub.conf +--- lorax-templates-anolis-8.3.orig/80-anolis/config_files/aarch64/grub.conf 2020-07-08 06:26:52.000000000 +0800 ++++ lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub.conf 2022-02-24 19:26:25.138232273 +0800 +@@ -5,9 +5,13 @@ + hiddenmenu + title Install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ quiet +- initrd @INITRDPATH@ ++ kernel @ANCKKERNELPATH@ @ROOT@ quiet ++ initrd @ANCKINITRDPATH@ ++title Install @PRODUCT@ @VERSION@ in compitable mode ++ findiso ++ kernel @RHCKKERNELPATH@ @ROOT@ quiet ++ initrd @RHCKINITRDPATH@ + title Test this media & install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ rd.live.check quiet +- initrd @INITRDPATH@ ++ kernel @ANCKKERNELPATH@ @ROOT@ rd.live.check quiet ++ initrd @ANCKINITRDPATH@ diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 65b2d6a..6f91dde 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 7 Name: lorax-templates-anolis Version: 8.3 Release: 4.%{anolis_release}%{?dist} @@ -12,6 +12,7 @@ Source0: lorax-templates-anolis-8.3-4.tar.gz Patch1000: 1000-lorax-templates-anolis-add-loongarch64-support.patch Patch1001: 1001-install-kernel-with-version-suffixed.patch Patch1002: 1002-correct-images_xen-tree-info.patch +Patch1003: 1003-tmpl-update-kernels-for-aarch64-efi.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -25,6 +26,7 @@ placed in %{templatedir} %patch1000 -p1 %patch1001 -p1 %patch1002 -p1 +%patch1003 -p1 %build # nothing to build @@ -39,6 +41,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Feb 24 2022 Liwei Ge - 8.3-4.7 +- Pass kernels for aarch64 efi + * Thu Feb 24 2022 Liwei Ge - 8.3-4.6 - Correct images-xen tree info -- Gitee