diff --git a/1001-custom-config.patch b/1001-custom-config.patch index c688a53038f7dadde946c056556d6ce2a96d73d6..67a8d65bee2d2db5272e4e0e450a02e9d05308d3 100644 --- a/1001-custom-config.patch +++ b/1001-custom-config.patch @@ -1,6 +1,6 @@ ---- lorax-37.0/share/templates.d/99-generic/runtime-install.tmpl 2022-03-29 02:50:47.000000000 +0800 -+++ lorax-37.0-edit/share/templates.d/99-generic/runtime-install.tmpl 2022-04-29 11:51:19.000000000 +0800 -@@ -2,7 +2,6 @@ +--- lorax-37.0/share/templates.d/99-generic/runtime-install.tmpl 2022-05-18 13:06:59.031358152 +0800 ++++ lorax-37.0-ano/share/templates.d/99-generic/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. @@ -8,7 +8,12 @@ %> ## anaconda package -@@ -41,13 +40,13 @@ + 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 @@ -24,7 +29,7 @@ installpkg grubby-deprecated installpkg kernel-lpae installpkg uboot-tools -@@ -56,22 +55,22 @@ +@@ -56,22 +56,22 @@ installpkg gpart %endif %if basearch == "x86_64": @@ -54,7 +59,13 @@ %endif %if basearch == "s390x": installpkg lsscsi s390utils-base s390utils-cmsfs-fuse s390utils-hmcdrvfs -@@ -182,11 +181,13 @@ +@@ -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 diff --git a/1002-add-uefi-parameter.patch b/1002-add-uefi-parameter.patch new file mode 100644 index 0000000000000000000000000000000000000000..3ab0b20c2620b5d89853078d21be5bd4f96d343a --- /dev/null +++ b/1002-add-uefi-parameter.patch @@ -0,0 +1,54 @@ +--- lorax-37.0-ano/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-37.0/share/templates.d/99-generic/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 console=tty1 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 console=tty1 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 console=tty1 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 console=tty1 inst.profile=anolis + initrd @INITRDPATH@ + } + } +--- lorax-37.0-ano/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg 2022-03-29 02:50:47.000000000 +0800 ++++ lorax-37.0/share/templates.d/99-generic/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 console=tty1 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 console=tty1 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 console=tty1 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 console=tty1 inst.profile=anolis + initrdefi @INITRDPATH@ + } + } diff --git a/lorax.spec b/lorax.spec index d400ced54dea6bef45c6e5b87373fb5c089e2f11..40352f9fbc7918bf15c8f5f4550b62e6d322729e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 37.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,7 @@ Source0: https://github.com/weldr/lorax/archive/refs/tags/%{name}-%{versi # Adjust templates for anolis23 Patch1001: 1001-custom-config.patch +Patch1002: 1002-add-uefi-parameter.patch BuildRequires: python3-devel BuildRequires: make @@ -119,6 +120,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} %patch1001 -p1 +%patch1002 -p1 %build @@ -160,6 +162,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue May 17 2022 gcdota930915 37.0-4 +- Add anolis uefi parameter in grub2 cmdline + * Thu May 5 2022 gcdota930915 37.0-3 - Remove nano-default-editor requirement in runtime-install.tmpl by patch - Enable dbus_daemon service by patch