diff --git a/1001-custom-config.patch b/1001-custom-config.patch deleted file mode 100644 index 67a8d65bee2d2db5272e4e0e450a02e9d05308d3..0000000000000000000000000000000000000000 --- a/1001-custom-config.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- 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. --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-37.0/share/templates.d/99-generic/runtime-postinstall.tmpl 2022-03-29 02:50:47.000000000 +0800 -+++ lorax-37.0-edit/share/templates.d/99-generic/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-37.0/share/templates.d/99-generic/runtime-cleanup.tmpl 2022-03-29 02:50:47.000000000 +0800 -+++ lorax-37.0-edit/share/templates.d/99-generic/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/1002-add-uefi-parameter.patch b/1002-add-uefi-parameter.patch deleted file mode 100644 index 3ab0b20c2620b5d89853078d21be5bd4f96d343a..0000000000000000000000000000000000000000 --- a/1002-add-uefi-parameter.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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-37.0.1.tar.gz b/lorax-37.0.1.tar.gz deleted file mode 100644 index 90c9cb1257bc2707fde3baad23c4be27afe7b4e2..0000000000000000000000000000000000000000 Binary files a/lorax-37.0.1.tar.gz and /dev/null differ diff --git a/lorax-37.0.tar.gz b/lorax-37.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfce55cfc486eb69c420228d5ebd346a45c39286 Binary files /dev/null and b/lorax-37.0.tar.gz differ diff --git a/lorax.spec b/lorax.spec index 40352f9fbc7918bf15c8f5f4550b62e6d322729e..d449b93e81256d405b057110f49a099775468d34 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,20 +1,16 @@ +%define anolis_release 5 # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} -%global subrelease 1 Name: lorax Version: 37.0 -Release: 4%{?dist} +Release: %{anolis_release}%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ URL: https://github.com/weldr/lorax -Source0: https://github.com/weldr/lorax/archive/refs/tags/%{name}-%{version}.%{subrelease}.tar.gz - -# Adjust templates for anolis23 -Patch1001: 1001-custom-config.patch -Patch1002: 1002-add-uefi-parameter.patch +Source0: https://github.com/weldr/lorax/archive/refs/tags/%{name}-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: make @@ -119,8 +115,6 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} -%patch1001 -p1 -%patch1002 -p1 %build @@ -162,6 +156,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Oct 27 2022 gaochang 37.0-5 +- Remove templates patches + * Tue May 17 2022 gcdota930915 37.0-4 - Add anolis uefi parameter in grub2 cmdline