diff --git a/1001-custom-config.patch b/1001-custom-config.patch new file mode 100644 index 0000000000000000000000000000000000000000..c688a53038f7dadde946c056556d6ce2a96d73d6 --- /dev/null +++ b/1001-custom-config.patch @@ -0,0 +1,105 @@ +--- 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 @@ + <%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 +@@ -41,13 +40,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 +55,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 +@@ -182,11 +181,13 @@ + 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/lorax-37.0.1.tar.gz b/lorax-37.0.1.tar.gz index 4f332acf1a98eab37a4e29f31e96cd1f9dee37e7..90c9cb1257bc2707fde3baad23c4be27afe7b4e2 100644 Binary files a/lorax-37.0.1.tar.gz and b/lorax-37.0.1.tar.gz differ diff --git a/lorax.spec b/lorax.spec index 4f35f777211f1b75f91757d0b96ead702e7722b1..d400ced54dea6bef45c6e5b87373fb5c089e2f11 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,13 +5,16 @@ Name: lorax Version: 37.0 -Release: 2%{?dist} +Release: 3%{?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 + BuildRequires: python3-devel BuildRequires: make BuildRequires: systemd-rpm-macros @@ -115,6 +118,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch1001 -p1 %build @@ -156,8 +160,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Apr 7 2022 gcdota930915 37.0-2 -- remove nano-default-editor requirement in template intall-runtime +* 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 +- Edit the previous changelog record + +* Thu Apr 28 2022 gcdota930915 37.0-2 +- Remove nano-default-editor requirement in runtime-install.tmpl - Enable dbus_daemon service * Thu Apr 7 2022 gcdota930915 37.0-1