diff --git a/0001-add-BOOTLOONGARCH64.EFI-to-support-new-firmware.patch b/0001-add-BOOTLOONGARCH64.EFI-to-support-new-firmware.patch deleted file mode 100644 index 3b3f496dc52938445d109b3fcdfaf1cb93b1d884..0000000000000000000000000000000000000000 --- a/0001-add-BOOTLOONGARCH64.EFI-to-support-new-firmware.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7492dbb412aa274cc4fddb680e611e05b5609b23 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Wed, 3 Aug 2022 10:07:44 +0800 -Subject: [PATCH] add BOOTLOONGARCH64.EFI to support new firmware - ---- - 80-anolis/loongarch64.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/80-anolis/loongarch64.tmpl b/80-anolis/loongarch64.tmpl -index 3272d9b..1a51651 100644 ---- a/80-anolis/loongarch64.tmpl -+++ b/80-anolis/loongarch64.tmpl -@@ -55,6 +55,7 @@ mkdir ${KERNELDIR} - mkdir ${EFIBOOTDIR}/fonts/ - - install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI -+ install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH64.EFI - install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ - - ## actually make the EFI images --- -2.27.0 - diff --git a/1000-lorax-templates-anolis-add-loongarch64-support.patch b/1000-lorax-templates-anolis-add-loongarch64-support.patch deleted file mode 100644 index 6aebf3f8012113460237e5a2658b482fc40ed203..0000000000000000000000000000000000000000 --- a/1000-lorax-templates-anolis-add-loongarch64-support.patch +++ /dev/null @@ -1,237 +0,0 @@ -diff -Nur lorax-templates-anolis-8.3/80-anolis/config_files/loongarch64/boot.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/loongarch64/boot.cfg ---- lorax-templates-anolis-8.3/80-anolis/config_files/loongarch64/boot.cfg 1970-01-01 08:00:00.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/loongarch64/boot.cfg 2021-09-24 13:03:44.578351034 +0800 -@@ -0,0 +1,13 @@ -+timeout 5 -+showmenu 1 -+default 0 -+ -+title Install @PRODUCT@ @VERSION@ (USB) -+ kernel (usb0,0)@KERNELPATH@ -+ initrd (usb0,0)@INITRDPATH@ -+ args @ROOT@ rhgb -+ -+title Install @PRODUCT@ @VERSION@ (SATA-CD) -+ kernel (cd0,0)@KERNELPATH@ -+ initrd (cd0,0)@INITRDPATH@ -+ args @ROOT@ rhgb -diff -Nur lorax-templates-anolis-8.3/80-anolis/config_files/loongarch64/grub2-efi.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/loongarch64/grub2-efi.cfg ---- lorax-templates-anolis-8.3/80-anolis/config_files/loongarch64/grub2-efi.cfg 1970-01-01 08:00:00.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/loongarch64/grub2-efi.cfg 2021-09-24 13:04:10.666378894 +0800 -@@ -0,0 +1,27 @@ -+ -+set default="0" -+ -+function load_video { -+ insmod efi_gop -+ insmod efi_uga -+ insmod video_bochs -+ insmod video_cirrus -+ insmod all_video -+} -+ -+load_video -+set gfxpayload=keep -+insmod gzio -+insmod part_gpt -+insmod ext2 -+ -+set timeout=60 -+### END /etc/grub.d/00_header ### -+ -+search --no-floppy --set=root -l '@ISOLABEL@' -+ -+### BEGIN /etc/grub.d/10_linux ### -+menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ quiet -+ initrd @INITRDPATH@ -+} -diff -Nur lorax-templates-anolis-8.3/80-anolis/loongarch64.tmpl lorax-templates-anolis-8.3.new/80-anolis/loongarch64.tmpl ---- lorax-templates-anolis-8.3/80-anolis/loongarch64.tmpl 1970-01-01 08:00:00.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/loongarch64.tmpl 2021-09-24 12:36:57.509636995 +0800 -@@ -0,0 +1,145 @@ -+<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> -+<% -+configdir="tmp/config_files/loongarch64" -+PXEBOOTDIR="images/pxeboot" -+KERNELDIR=PXEBOOTDIR -+STAGE2IMG="images/install.img" -+LORAXDIR="usr/share/lorax/" -+ -+from os.path import basename -+%> -+ -+## Test ${runtime_img} to see if udf is needed -+<% -+ import os -+ from pylorax.sysutils import joinpaths -+ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: -+ udfargs = "-allow-limited-size" -+ else: -+ udfargs = "" -+%> -+ -+mkdir images -+install ${runtime_img} ${STAGE2IMG} -+treeinfo stage2 mainimage ${STAGE2IMG} -+ -+## install kernels -+mkdir ${KERNELDIR} -+%for kernel in kernels: -+ ## normal loongarch64 -+ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz -+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img -+%endfor -+ -+#FIXME: this will need adjusted when we have a real bootloader. -+## WHeeeeeeee, EFI. -+## We could remove the basearch restriction someday.. -+<% efiargs=""; efigraft="" %> -+%if exists("boot/efi/EFI/*/grubloongarch64.efi"): -+ <% -+ efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) -+ images = ["images/efiboot.img"] -+ EFIBOOTDIR="EFI/BOOT" -+ %> -+ %for img in images: -+ <% -+ efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) -+ efigraft += " {0}={1}/{0}".format(img,outroot) -+ %> -+ treeinfo images-${basearch} ${img|basename} ${img} -+ %endfor -+ -+ # <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> -+ -+ mkdir ${EFIBOOTDIR} -+ mkdir ${EFIBOOTDIR}/fonts/ -+ -+ install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI -+ install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ -+ -+ ## actually make the EFI images -+ ${make_efiboot("images/efiboot.img")} -+ -+ <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')"> -+ <% -+ kdir = EFIBOOTDIR if include_kernel else KERNELDIR -+ eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) -+ args = "--label=ANACONDA --debug" -+ if disk: args += " --disk" -+ %> -+ %if include_kernel: -+ copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} -+ copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} -+ %endif -+ install ${configdir}/grub2-efi.cfg ${eficonf} -+ replace @PRODUCT@ '${product.name}' ${eficonf} -+ replace @VERSION@ ${product.version} ${eficonf} -+ replace @KERNELNAME@ vmlinuz ${eficonf} -+ replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} -+ replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} -+ replace @ISOLABEL@ '${isolabel}' ${eficonf} -+ %if disk: -+ replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf} -+ %else: -+ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf} -+ %endif -+ runcmd mkefiboot ${args} ${outroot}/${EFIBOOTDIR} ${outroot}/${img} -+ %if include_kernel: -+ remove ${EFIBOOTDIR}/vmlinuz -+ remove ${EFIBOOTDIR}/initrd.img -+ %endif -+ -+ -+ ## Loongson PMON boot.cfg -+ <% -+ pmonbootdir = "boot" -+ kdir = KERNELDIR -+ bootconf = "%s/boot.cfg" % (pmonbootdir,) -+ args = "--label=ANACONDA --debug" -+ if disk: args += " --disk" -+ %> -+ -+ ##pmon bios -+ mkdir ${pmonbootdir} -+ install ${configdir}/boot.cfg ${bootconf} -+ -+ replace @PRODUCT@ '${product.name}' ${bootconf} -+ replace @VERSION@ ${product.version} ${bootconf} -+ replace @KERNELPATH@ /${kdir}/vmlinuz ${bootconf} -+ replace @INITRDPATH@ /${kdir}/initrd.img ${bootconf} -+ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${bootconf} -+%endif -+ -+# Create optional product.img and updates.img -+<% filegraft=""; images=["product", "updates"] %> -+%for img in images: -+ %if exists("%s/%s/" % (LORAXDIR, img)): -+ installimg ${LORAXDIR}/${img}/ images/${img}.img -+ treeinfo images-${basearch} ${img}.img images/${img}.img -+ <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %> -+ %endif -+%endfor -+ -+# Inherit iso-graft/ if it exists from external templates -+<% -+ import os -+ if os.path.exists(workdir + "/iso-graft"): -+ filegraft += " " + workdir + "/iso-graft" -+%> -+ -+# Add the license files -+%for f in glob("/usr/share/licenses/*-release/*"): -+ install ${f} ${f|basename} -+ <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> -+%endfor -+ -+%if exists("boot/efi/EFI/*/gcdaa64.efi"): -+## make boot.iso -+runcmd mkisofs -o ${outroot}/images/boot.iso \ -+ ${efiargs} -R -J -V '${isolabel}' -T ${udfargs} \ -+ -graft-points \ -+ ${KERNELDIR}=${outroot}/${KERNELDIR} \ -+ ${STAGE2IMG}=${outroot}/${STAGE2IMG} \ -+ ${efigraft} ${filegraft} -+treeinfo images-${basearch} boot.iso images/boot.iso -+%endif -diff -Nur lorax-templates-anolis-8.3/80-anolis/runtime-install.tmpl lorax-templates-anolis-8.3.new/80-anolis/runtime-install.tmpl ---- lorax-templates-anolis-8.3/80-anolis/runtime-install.tmpl 2020-12-26 00:16:14.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/runtime-install.tmpl 2021-09-24 12:20:44.557600106 +0800 -@@ -7,7 +7,10 @@ - - ## Other available payloads - installpkg dnf --installpkg rpm-ostree ostree -+%if basearch != "loongarch64": -+ installpkg rpm-ostree -+%endif -+installpkg ostree - ## speed up compression on multicore systems - installpkg pigz - installpkg anolis-repos -@@ -54,6 +57,13 @@ - installpkg lsscsi s390utils-base s390utils-cmsfs-fuse - installpkg s390utils-hmcdrvfs - %endif -+%if basearch == "loongarch64": -+ installpkg grub2-efi-loongarch64-cdboot grubby grub2-tools-minimal -+ installpkg grub2-common grub2-tools-extra grubby-deprecated grub2-tools grub2-efi-loongarch64 -+ installpkg efibootmgr -+ installpkg avahi-libs avahi-glib -+%endif -+ - - ## yay, plymouth - installpkg plymouth -@@ -116,7 +126,9 @@ - %endif - installpkg net-tools - installpkg nmap-ncat --installpkg prefixdevname -+%if basearch != "loongarch64": -+ installpkg prefixdevname -+%endif - - ## hardware utilities/libraries - installpkg pciutils usbutils ipmitool diff --git a/1001-custom-config.patch b/1001-custom-config.patch new file mode 100644 index 0000000000000000000000000000000000000000..1ef4350452df7edc25b89652888ea086884755e0 --- /dev/null +++ b/1001-custom-config.patch @@ -0,0 +1,116 @@ +--- lorax-templates-anolis-23/80-anolis/runtime-install.tmpl 2022-05-18 13:06:59.031358152 +0800 ++++ lorax-templates-anolis-23-1-b/80-anolis/runtime-install.tmpl 2022-05-18 13:06:45.179358978 +0800 +@@ -2,11 +2,11 @@ + <%page args="basearch, product"/> + <% + # This version of grub2 moves the font directory and is needed to keep the efi template from failing. +-GRUB2VER="1:2.06-3" + %> + + ## anaconda package + installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps ++installpkg mesa-libgbm-devel + ## Other available payloads + installpkg dnf + installpkg rpm-ostree ostree +@@ -41,13 +41,13 @@ + ## arch-specific packages (bootloaders etc.) + %if basearch == "aarch64": + installpkg efibootmgr +- installpkg grub2-efi-aa64-cdboot>=${GRUB2VER} ++ installpkg grub2-efi-aa64-cdboot + installpkg shim-aa64 + installpkg uboot-tools + %endif + %if basearch in ("arm", "armhfp"): + installpkg efibootmgr +- installpkg grub2-efi-arm-cdboot>=${GRUB2VER} ++ installpkg grub2-efi-arm-cdboot + installpkg grubby-deprecated + installpkg kernel-lpae + installpkg uboot-tools +@@ -56,22 +56,22 @@ + installpkg gpart + %endif + %if basearch == "x86_64": +- installpkg grub2-tools-efi>=${GRUB2VER} ++ installpkg grub2-tools-efi + installpkg efibootmgr + installpkg shim-x64 +- installpkg grub2-efi-x64-cdboot>=${GRUB2VER} ++ installpkg grub2-efi-x64-cdboot + installpkg shim-ia32 +- installpkg grub2-efi-ia32-cdboot>=${GRUB2VER} ++ installpkg grub2-efi-ia32-cdboot + %endif + %if basearch in ("i386", "x86_64"): + installpkg biosdevname syslinux +- installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} +- installpkg grub2-tools-extra>=${GRUB2VER} ++ installpkg grub2-tools grub2-tools-minimal ++ installpkg grub2-tools-extra + %endif + %if basearch == "ppc64le": + installpkg powerpc-utils lsvpd ppc64-diag +- installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} +- installpkg grub2-tools-extra>=${GRUB2VER} grub2-${basearch}>=${GRUB2VER} ++ installpkg grub2-tools grub2-tools-minimal ++ installpkg grub2-tools-extra grub2-${basearch} + %endif + %if basearch == "s390x": + installpkg lsscsi s390utils-base s390utils-cmsfs-fuse s390utils-hmcdrvfs +@@ -177,16 +177,18 @@ + + ## debugging/bug reporting tools + installpkg gdb-gdbserver +-installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader ++## installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader + installpkg fpaste + installpkg python3-pyatspi + + ## extra tools not required by anaconda +-installpkg nano nano-default-editor ++## installpkg nano nano-default-editor ++installpkg nano + installpkg vim-minimal strace lsof dump xz less + installpkg wget rsync bind-utils ftp mtr vconfig + installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils ++installpkg prefixdevname + + ## actually install all the requested packages + run_pkg_transaction +--- lorax-templates-anolis-23/80-anolis/runtime-postinstall.tmpl 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-templates-anolis-23-1-b/80-anolis/runtime-postinstall.tmpl 2022-04-29 20:52:30.000000000 +0800 +@@ -26,6 +26,7 @@ + mkdir etc/systemd/system/local-fs.target.wants/ + symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount + ++systemctl enable dbus-daemon + ## Disable unwanted systemd services + systemctl disable systemd-readahead-collect.service \ + systemd-readahead-replay.service \ +--- lorax-templates-anolis-23/80-anolis/runtime-cleanup.tmpl 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-templates-anolis-23-1-b/80-anolis/runtime-cleanup.tmpl 2022-04-29 11:27:40.000000000 +0800 +@@ -1,5 +1,6 @@ + ## lorax template file: cleanup for the ramdisk (runtime image) +-<%page args="libdir, branding, root"/> ++## <%page args="libdir, branding, root"/> ++<%page args="libdir, root"/> + + ## remove the sources + remove usr/share/i18n +@@ -302,13 +303,6 @@ + removefrom xorg-x11-drv-wacom /usr/bin/* + removefrom yelp /usr/share/yelp/mathjax* + +-%if branding.release: +- removefrom ${branding.logos} /usr/share/plymouth/* +- removefrom ${branding.logos} /etc/* +- removefrom ${branding.logos} /usr/share/icons/{Bluecurve,oxygen}/* +- removefrom ${branding.logos} /usr/share/{kde4,pixmaps}/* +-%endif +- + ## cleanup /boot/ leaving vmlinuz, and .*hmac files + runcmd chroot ${root} find /boot \! -name "vmlinuz*" \ + -and \! -name ".vmlinuz*" \ diff --git a/1001-install-kernel-with-version-suffixed.patch b/1001-install-kernel-with-version-suffixed.patch deleted file mode 100644 index 88a1971d7f1da849db7d42d9eb6fe130fe2a6cfe..0000000000000000000000000000000000000000 --- a/1001-install-kernel-with-version-suffixed.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -Nur lorax-templates-anolis-8.3/80-anolis/aarch64.tmpl lorax-templates-anolis-8.3.new/80-anolis/aarch64.tmpl ---- lorax-templates-anolis-8.3/80-anolis/aarch64.tmpl 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/aarch64.tmpl 2022-02-18 17:12:12.111334130 +0800 -@@ -27,8 +27,8 @@ - mkdir ${KERNELDIR} - %for kernel in kernels: - ## normal aarch64 -- installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz -- installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img -+ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.version} -+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.version}.img - %endfor - - #FIXME: this will need adjusted when we have a real bootloader. -diff -Nur lorax-templates-anolis-8.3/80-anolis/config_files/x86/grub2-efi.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub2-efi.cfg ---- lorax-templates-anolis-8.3/80-anolis/config_files/x86/grub2-efi.cfg 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub2-efi.cfg 2022-02-18 17:27:01.691905488 +0800 -@@ -21,20 +21,24 @@ - - ### BEGIN /etc/grub.d/10_linux ### - menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ quiet -- initrdefi @INITRDPATH@ -+ linuxefi @ANCKKERNELPATH@ @ROOT@ quiet -+ initrdefi @ANCKINITRDPATH@ -+} -+menuentry 'Install @PRODUCT@ @VERSION@ in compatible mode' --class fedora --class gnu-linux --class gnu --class os { -+ linuxefi @RHCKKERNELPATH@ @ROOT@ quiet -+ initrdefi @RHCKINITRDPATH@ - } - menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet -- initrdefi @INITRDPATH@ -+ linuxefi @ANCKKERNELPATH@ @ROOT@ rd.live.check quiet -+ initrdefi @ANCKINITRDPATH@ - } - submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet -- initrdefi @INITRDPATH@ -+ linuxefi @ANCKKERNELPATH@ @ROOT@ nomodeset quiet -+ initrdefi @ANCKINITRDPATH@ - } - menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rescue quiet -- initrdefi @INITRDPATH@ -+ linuxefi @ANCKKERNELPATH@ @ROOT@ rescue quiet -+ initrdefi @ANCKINITRDPATH@ - } - } -diff -Nur lorax-templates-anolis-8.3/80-anolis/config_files/x86/grub.conf lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub.conf ---- lorax-templates-anolis-8.3/80-anolis/config_files/x86/grub.conf 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub.conf 2022-02-18 17:27:33.024031278 +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 -Nur lorax-templates-anolis-8.3/80-anolis/config_files/x86/isolinux.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/isolinux.cfg ---- lorax-templates-anolis-8.3/80-anolis/config_files/x86/isolinux.cfg 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/isolinux.cfg 2022-02-18 17:28:59.604378874 +0800 -@@ -60,14 +60,19 @@ - - label linux - menu label ^Install @PRODUCT@ @VERSION@ -- kernel vmlinuz -- append initrd=initrd.img @ROOT@ quiet -+ kernel vmlinuz-@ANCK@ -+ append initrd=initrd-@ANCK@.img @ROOT@ quiet -+ -+label linux -+ menu label ^Install @PRODUCT@ @VERSION@ in compatible mode -+ kernel vmlinuz-@RHCK@ -+ append initrd=initrd-@RHCK@.img @ROOT@ quiet - - label check - menu label Test this ^media & install @PRODUCT@ @VERSION@ - menu default -- kernel vmlinuz -- append initrd=initrd.img @ROOT@ rd.live.check quiet -+ kernel vmlinuz-@ANCK@ -+ append initrd=initrd-@ANCK@.img @ROOT@ rd.live.check quiet - - menu separator # insert an empty line - -@@ -82,8 +87,8 @@ - Try this option out if you're having trouble installing - @PRODUCT@ @VERSION@. - endtext -- kernel vmlinuz -- append initrd=initrd.img @ROOT@ nomodeset quiet -+ kernel vmlinuz-@ANCK@ -+ append initrd=initrd-@ANCK@.img @ROOT@ nomodeset quiet - - label rescue - menu indent count 5 -@@ -92,8 +97,8 @@ - If the system will not boot, this lets you access files - and edit config files to try to get it booting again. - endtext -- kernel vmlinuz -- append initrd=initrd.img @ROOT@ rescue quiet -+ kernel vmlinuz-@ANCK@ -+ append initrd=initrd-@ANCK@.img @ROOT@ rescue quiet - - label memtest - menu label Run a ^memory test -diff -Nur lorax-templates-anolis-8.3/80-anolis/efi.tmpl lorax-templates-anolis-8.3.new/80-anolis/efi.tmpl ---- lorax-templates-anolis-8.3/80-anolis/efi.tmpl 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/efi.tmpl 2022-02-21 10:21:42.264812328 +0800 -@@ -1,4 +1,4 @@ --<%page args="configdir, KERNELDIR, efiarch32, efiarch64, isolabel"/> -+<%page args="kernels, configdir, KERNELDIR, efiarch32, efiarch64, isolabel"/> - <% - EFIBOOTDIR="EFI/BOOT" - APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns" -@@ -20,13 +20,13 @@ - install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ - - ## actually make the EFI images --${make_efiboot("images/efiboot.img")} -+${make_efiboot(kernels, "images/efiboot.img")} - %if domacboot: - ${make_efiboot("images/macboot.img", imgtype="apple")} - %endif - - ## This is kinda gross, but then... so's EFI. --<%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')"> -+<%def name="make_efiboot(kernels, img, include_kernel=False, disk=False, imgtype='default')"> - <% - kdir = EFIBOOTDIR if include_kernel else KERNELDIR - eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) -@@ -35,15 +35,25 @@ - if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version) - %> - %if include_kernel: -- copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} -- copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} -+ copy ${KERNELDIR}/vmlinuz-${kernel.version} ${EFIBOOTDIR} -+ copy ${KERNELDIR}/initrd-${kernel.version}.img ${EFIBOOTDIR} - %endif - install ${configdir}/grub2-efi.cfg ${eficonf} - replace @PRODUCT@ '${product.name}' ${eficonf} - replace @VERSION@ ${product.version} ${eficonf} -- replace @KERNELNAME@ vmlinuz ${eficonf} -- replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} -- replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} -+ -+ %for kernel in kernels: -+ %if kernel.version.startswith("4.19.91-"): -+ replace @ANCKKERNELNAME@ vmlinuz-${kernel.version} ${eficonf} -+ replace @ANCKKERNELPATH@ /${kdir}/vmlinuz-${kernel.version} ${eficonf} -+ replace @ANCKINITRDPATH@ /${kdir}/initrd-${kernel.version}.img ${eficonf} -+ %else: -+ replace @RHCKKERNELNAME@ vmlinuz-${kernel.version} ${eficonf} -+ replace @RHCKKERNELPATH@ /${kdir}/vmlinuz-${kernel.version} ${eficonf} -+ replace @RHCKINITRDPATH@ /${kdir}/initrd-${kernel.version}.img ${eficonf} -+ %endif -+ %endfor -+ - replace @ISOLABEL@ '${isolabel}' ${eficonf} - %if disk: - replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf} -@@ -55,7 +65,7 @@ - %endif - runcmd mkefiboot ${args} ${outroot}/${EFIBOOTDIR} ${outroot}/${img} - %if include_kernel: -- remove ${EFIBOOTDIR}/vmlinuz -- remove ${EFIBOOTDIR}/initrd.img -+ remove ${EFIBOOTDIR}/vmlinuz-${kernel.version} -+ remove ${EFIBOOTDIR}/initrd-${kernel.version}.img - %endif - -diff -Nur lorax-templates-anolis-8.3/80-anolis/runtime-install.tmpl lorax-templates-anolis-8.3.new/80-anolis/runtime-install.tmpl ---- lorax-templates-anolis-8.3/80-anolis/runtime-install.tmpl 2020-12-26 00:16:14.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/runtime-install.tmpl 2022-02-21 11:27:42.519442134 +0800 -@@ -15,7 +15,13 @@ - ## kernel and firmware - ## NOTE: Without explicitly including kernel-modules-extra dnf will choose kernel-debuginfo-* - ## to satify a gfs2-utils kmod requirement --installpkg kernel kernel-modules kernel-modules-extra -+%if product.version == "7" and basearch == "x86_64": -+ installpkg kernel-3.10.0 kernel-modules-3.10.0 kernel-modules-extra-3.10.0 -+%else: -+ installpkg kernel-4.18.0 kernel-modules-4.18.0 kernel-modules-extra-4.18.0 -+%endif -+installpkg kernel-4.19.91 kernel-modules-4.19.91 kernel-modules-extra-4.19.91 -+ - installpkg grubby - %if basearch != "s390x": - ## skip the firmware for sound, video, and scanners, none of which will -diff -Nur lorax-templates-anolis-8.3/80-anolis/x86.tmpl lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl ---- lorax-templates-anolis-8.3/80-anolis/x86.tmpl 2020-07-08 06:26:52.000000000 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl 2022-02-21 10:23:07.944976279 +0800 -@@ -58,13 +58,18 @@ - installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img - %else: - ## normal i386, x86_64 -- installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz -- installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img -+ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.version} -+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.version}.img - %endif -+ %if kernel.version.startswith("4.19.91-"): -+ replace @ANCK@ ${kernel.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -+ %else: -+ replace @RHCK@ ${kernel.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -+ %endif -+ hardlink ${KERNELDIR}/vmlinuz-${kernel.version} ${BOOTDIR} -+ hardlink ${KERNELDIR}/initrd-${kernel.version}.img ${BOOTDIR} - %endfor - --hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} --hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} - %if basearch == 'x86_64': - treeinfo images-xen kernel ${KERNELDIR}/vmlinuz - treeinfo images-xen initrd ${KERNELDIR}/initrd.img -@@ -93,7 +98,7 @@ - treeinfo images-${basearch} ${img|basename} ${img} - %endfor - <% efihybrid = "--uefi --mac" if domacboot else "--uefi" %> -- <%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 --git a/1002-add-uefi-parameter.patch b/1002-add-uefi-parameter.patch new file mode 100644 index 0000000000000000000000000000000000000000..f6b3681847c4b819ceb7a5cfcf8fb992a0fc88bc --- /dev/null +++ b/1002-add-uefi-parameter.patch @@ -0,0 +1,54 @@ +--- lorax-templates-anolis-23/80-anolis/config_files/aarch64/grub2-efi.cfg 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-templates-anolis-23-1-b/80-anolis/config_files/aarch64/grub2-efi.cfg 2022-05-17 20:53:41.337838926 +0800 +@@ -27,20 +27,20 @@ + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro ++ linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis + initrd @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis + initrd @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ inst.rescue ++ linux @KERNELPATH@ @ROOT@ inst.rescue inst.profile=anolis + initrd @INITRDPATH@ + } + } +--- lorax-templates-anolis-23/80-anolis/config_files/x86/grub2-efi.cfg 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-templates-anolis-23-1-b/80-anolis/config_files/x86/grub2-efi.cfg 2022-05-18 12:54:10.412403965 +0800 +@@ -21,20 +21,20 @@ + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ quiet ++ linuxefi @KERNELPATH@ @ROOT@ quiet inst.profile=anolis + initrdefi @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet ++ linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet inst.profile=anolis + initrdefi @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet ++ linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet inst.profile=anolis + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet ++ linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet inst.profile=anolis + initrdefi @INITRDPATH@ + } + } diff --git a/1002-correct-images_xen-tree-info.patch b/1002-correct-images_xen-tree-info.patch deleted file mode 100644 index ff22801fc5ec80403e25ec93c08a9bd0d7be3ab0..0000000000000000000000000000000000000000 --- a/1002-correct-images_xen-tree-info.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur lorax-templates-anolis-8.3/80-anolis/x86.tmpl lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl ---- lorax-templates-anolis-8.3/80-anolis/x86.tmpl 2022-02-24 14:37:45.519571981 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl 2022-02-24 14:20:47.056594971 +0800 -@@ -71,8 +71,8 @@ - %endfor - - %if basearch == 'x86_64': -- treeinfo images-xen kernel ${KERNELDIR}/vmlinuz -- treeinfo images-xen initrd ${KERNELDIR}/initrd.img -+ treeinfo images-xen kernel ${KERNELDIR}/vmlinuz-${kernel.version} -+ treeinfo images-xen initrd ${KERNELDIR}/initrd-${kernel.version}.img - %endif - - ## WHeeeeeeee, EFI. diff --git a/1003-tmpl-update-kernels-for-aarch64-efi.patch b/1003-tmpl-update-kernels-for-aarch64-efi.patch deleted file mode 100644 index 6ffdf287465c064711c4f26d232d4b12c2ca407e..0000000000000000000000000000000000000000 --- a/1003-tmpl-update-kernels-for-aarch64-efi.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 { -+ linux @RHCKKERNELPATH@ @ROOT@ quiet -+ initrd @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/1004-shift-default-boot-number.patch b/1004-shift-default-boot-number.patch deleted file mode 100644 index bc60b091a8613a711da688eed1444973c0aaa442..0000000000000000000000000000000000000000 --- a/1004-shift-default-boot-number.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 2022-02-25 10:16:35.087162594 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub2-efi.cfg 2022-02-25 10:16:07.866109673 +0800 -@@ -1,4 +1,4 @@ --set default="1" -+set default="2" - - function load_video { - if [ x$feature_all_video_module = xy ]; then -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 2022-02-25 10:16:35.088162596 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/aarch64/grub.conf 2022-02-25 10:14:34.659928471 +0800 -@@ -1,5 +1,5 @@ - #debug --graphics --default=0 -+default=2 - splashimage=@SPLASHPATH@ - timeout 5 - hiddenmenu -diff -Nur lorax-templates-anolis-8.3.orig/80-anolis/config_files/x86/grub2-efi.cfg lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub2-efi.cfg ---- lorax-templates-anolis-8.3.orig/80-anolis/config_files/x86/grub2-efi.cfg 2022-02-24 14:37:45.518571979 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub2-efi.cfg 2022-02-25 10:13:43.445828910 +0800 -@@ -1,4 +1,4 @@ --set default="1" -+set default="2" - - function load_video { - insmod efi_gop -diff -Nur lorax-templates-anolis-8.3.orig/80-anolis/config_files/x86/grub.conf lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub.conf ---- lorax-templates-anolis-8.3.orig/80-anolis/config_files/x86/grub.conf 2022-02-24 14:37:45.518571979 +0800 -+++ lorax-templates-anolis-8.3.new/80-anolis/config_files/x86/grub.conf 2022-02-25 10:13:23.408789955 +0800 -@@ -1,5 +1,5 @@ - #debug --graphics --default=1 -+default=2 - splashimage=@SPLASHPATH@ - timeout 60 - hiddenmenu diff --git a/lorax-templates-anolis-37.0.tar.gz b/lorax-templates-anolis-37.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5a6860f4713649f639caac9979af52c885a65136 Binary files /dev/null and b/lorax-templates-anolis-37.0.tar.gz differ diff --git a/lorax-templates-anolis-8.3-4.tar.gz b/lorax-templates-anolis-8.3-4.tar.gz deleted file mode 100644 index 694491ce0b1000d729d7ad23b72a460561830fc8..0000000000000000000000000000000000000000 Binary files a/lorax-templates-anolis-8.3-4.tar.gz and /dev/null differ diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index fb36e1dea7bc6f35be0a72c95d32a820e42d8cec..e533209d8ec4018b99d0f31fb2615cb5928ac062 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,36 +1,29 @@ -%define anolis_release 9 +%define anolis_release 1 Name: lorax-templates-anolis -Version: 8.3 -Release: 4.%{anolis_release}%{?dist} +Version: 37.0 +Release: 1.%{anolis_release}%{?dist} Summary: Anolis OS build templates for lorax and livemedia-creator License: GPLv2+ URL: https://github.com/weldr/lorax BuildArch: noarch -Source0: lorax-templates-anolis-8.3-4.tar.gz +# Copy from https://github.com/weldr/lorax/tree/master/share/templates.d/99-generic +Source0: lorax-templates-anolis-37.0.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 -Patch1004: 1004-shift-default-boot-number.patch -Patch1005: 0001-add-BOOTLOONGARCH64.EFI-to-support-new-firmware.patch +Patch1001: 1001-custom-config.patch +Patch1002: 1002-add-uefi-parameter.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis %description -Anolis OS specific Lorax templates for creating the boot.iso and live isos are +Anolis OS 23 specific Lorax templates for creating the boot.iso and live isos are placed in %{templatedir} %prep %setup -%patch1000 -p1 %patch1001 -p1 %patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 %build # nothing to build @@ -45,29 +38,5 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog -* Wed Aug 03 2022 Wenlong Zhang - 8.3-4.9 -- add BOOTLOONGARCH64.EFI to support new firmware - -* Fri Feb 25 2022 Liwei Ge - 8.3-4.8 -- Shift default boot number - -* 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 - -* Thu Feb 24 2022 Liwei Ge - 8.3-4.5 -- Fix efi templates - -* Mon Feb 21 2022 Liwei Ge - 8.3-4.4 -- Install multi kernel boot entry - -* Wed Dec 1 2021 Liwei Ge - 8.3-4.3 -- Remove grub2-tools-efi from loongarch64 - -* Fri Sep 24 2021 Liwei Ge - 8.3-4.2 -- Add loongarch64 support - -* Fri Dec 25 2020 Jacob Wang - 8.3-4.1 -- Initial version for Anolis OS +* Thu Oct 27 2022 gaochang - 37.0-1.1 +- Initial version for Anolis OS 23