From f3396b8406e321da470aafaf1090f9ac79d58be1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 09:28:50 -0700 Subject: [PATCH 01/13] Backport PR #1489 to drop install of shim-ia32 --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 57 +++++++++++++++++++ lorax.spec | 11 +++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch new file mode 100644 index 0000000..f22b97c --- /dev/null +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -0,0 +1,57 @@ +From 7064605df52709b1dec3c10b7c90a53ebe305990 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 26 Aug 2025 08:59:13 -0700 +Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) + +There is no shim-ia32 in shim-15.8-4, which was recently tagged +for f44. This is because it was built after +https://github.com/rhboot/efi-rpm-macros/commit/5c7fcc9 , so it +appears to be an intentional change - @pjones may confirm. + +Signed-off-by: Adam Williamson +--- + docs/fedora-livemedia.ks | 1 - + share/templates.d/99-generic/live/live-install.tmpl | 2 +- + share/templates.d/99-generic/runtime-install.tmpl | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks +index 9b779cb4..5ea41079 100644 +--- a/docs/fedora-livemedia.ks ++++ b/docs/fedora-livemedia.ks +@@ -89,7 +89,6 @@ case $ARCH in + echo "%packages" >> $PKGS + echo "@^workstation-product-environment" >> $PKGS + echo "shim" >> $PKGS +- echo "shim-ia32" >> $PKGS + echo "grub2" >> $PKGS + echo "grub2-efi" >> $PKGS + echo "grub2-efi-ia32" >> $PKGS +diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl +index ef514ee8..61dc5653 100644 +--- a/share/templates.d/99-generic/live/live-install.tmpl ++++ b/share/templates.d/99-generic/live/live-install.tmpl +@@ -10,7 +10,7 @@ + installpkg grub2-tools-efi + installpkg efibootmgr + installpkg shim-x64 grub2-efi-x64-cdboot +- installpkg shim-ia32 grub2-efi-ia32-cdboot ++ installpkg grub2-efi-ia32-cdboot + installpkg biosdevname + installpkg grub2-tools grub2-tools-minimal grub2-tools-extra + installpkg grub2-pc-modules +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index af06d912..94bcfe4e 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -70,7 +70,6 @@ installpkg glibc-all-langpacks + installpkg efibootmgr + installpkg shim-x64 + installpkg grub2-efi-x64-cdboot>=${GRUB2VER} +- installpkg shim-ia32 + installpkg grub2-efi-ia32-cdboot>=${GRUB2VER} + installpkg biosdevname + installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} +-- +2.49.0 + diff --git a/lorax.spec b/lorax.spec index 86c313f..d4efd75 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} +# https://github.com/weldr/lorax/pull/1489 +# Drop install of shim-ia32 as it no longer exists +Patch: 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -140,7 +144,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup +%forgeautosetup -p1 %build @@ -184,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-3 +- Backport PR #1489 to drop install of shim-ia32 + * Fri Aug 15 2025 Python Maint - 43.10-2 - Rebuilt for Python 3.14.0rc2 bytecode From 80c6536434ad7afeefd2db31f191145670c10147 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 11:24:16 -0700 Subject: [PATCH 02/13] Update PR #1489 patch to a better-working version --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 21 +++++++++++++++++-- lorax.spec | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch index f22b97c..429892d 100644 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -1,4 +1,4 @@ -From 7064605df52709b1dec3c10b7c90a53ebe305990 Mon Sep 17 00:00:00 2001 +From 189fc200859e3fb7e19b8deb1ffb2dd70356f073 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 08:59:13 -0700 Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) @@ -11,9 +11,10 @@ appears to be an intentional change - @pjones may confirm. Signed-off-by: Adam Williamson --- docs/fedora-livemedia.ks | 1 - + share/templates.d/99-generic/efi.tmpl | 3 +++ share/templates.d/99-generic/live/live-install.tmpl | 2 +- share/templates.d/99-generic/runtime-install.tmpl | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks index 9b779cb4..5ea41079 100644 @@ -27,6 +28,22 @@ index 9b779cb4..5ea41079 100644 echo "grub2" >> $PKGS echo "grub2-efi" >> $PKGS echo "grub2-efi-ia32" >> $PKGS +diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl +index d50c5750..dea00943 100644 +--- a/share/templates.d/99-generic/efi.tmpl ++++ b/share/templates.d/99-generic/efi.tmpl +@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi + %endif + %if efiarch32: ++## shim-ia32 is gone in F44+, other ia32 bits remain for now ++%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): + install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ ++%endif + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif + install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl index ef514ee8..61dc5653 100644 --- a/share/templates.d/99-generic/live/live-install.tmpl diff --git a/lorax.spec b/lorax.spec index d4efd75..378268a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -188,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-4 +- Update PR #1489 patch to a better-working version + * Tue Aug 26 2025 Adam Williamson - 43.10-3 - Backport PR #1489 to drop install of shim-ia32 From a86cd0ba5f6f851e39271827f5dd343ba422af05 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 16:58:06 -0700 Subject: [PATCH 03/13] Update PR #1489 patch again (fix lmc lives) --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 21 +++++++++++++++++-- lorax.spec | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch index 429892d..5e5f9fc 100644 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -1,4 +1,4 @@ -From 189fc200859e3fb7e19b8deb1ffb2dd70356f073 Mon Sep 17 00:00:00 2001 +From d44e5fcf28777ac123c98fc5851c4eb94f1b00a3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 08:59:13 -0700 Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) @@ -12,9 +12,10 @@ Signed-off-by: Adam Williamson --- docs/fedora-livemedia.ks | 1 - share/templates.d/99-generic/efi.tmpl | 3 +++ + share/templates.d/99-generic/live/efi.tmpl | 3 +++ share/templates.d/99-generic/live/live-install.tmpl | 2 +- share/templates.d/99-generic/runtime-install.tmpl | 1 - - 4 files changed, 4 insertions(+), 3 deletions(-) + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks index 9b779cb4..5ea41079 100644 @@ -37,6 +38,22 @@ index d50c5750..dea00943 100644 %endif %if efiarch32: +## shim-ia32 is gone in F44+, other ia32 bits remain for now ++%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): + install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ ++%endif + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif + install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ +diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl +index f1fd1b51..f847ed9f 100644 +--- a/share/templates.d/99-generic/live/efi.tmpl ++++ b/share/templates.d/99-generic/live/efi.tmpl +@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi + %endif + %if efiarch32: ++## shim-ia32 is gone in F44+, other ia32 bits remain for now +%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ diff --git a/lorax.spec b/lorax.spec index 378268a..4956459 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -188,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-5 +- Update PR #1489 patch again (fix lmc lives) + * Tue Aug 26 2025 Adam Williamson - 43.10-4 - Update PR #1489 patch to a better-working version From 182bf6f637a1f6bd9906ea56eff4c8301f38b710 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 8 Sep 2025 10:58:59 -0700 Subject: [PATCH 04/13] - maint: Switch default platform to F44 (bcl@redhat.com) - Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) - templates: Support product version to contain blank character in templates.d/99-generic (songmingliang@uniontech.com) --- .gitignore | 1 + ...lls-of-shim-ia32-it-no-longer-exists.patch | 91 ------------------- lorax.spec | 26 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 110 deletions(-) delete mode 100644 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch diff --git a/.gitignore b/.gitignore index 82cac26..2d7a36c 100644 --- a/.gitignore +++ b/.gitignore @@ -263,3 +263,4 @@ /lorax-43.8.tar.gz /lorax-43.9.tar.gz /lorax-43.10.tar.gz +/lorax-44.0.tar.gz diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch deleted file mode 100644 index 5e5f9fc..0000000 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d44e5fcf28777ac123c98fc5851c4eb94f1b00a3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 26 Aug 2025 08:59:13 -0700 -Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) - -There is no shim-ia32 in shim-15.8-4, which was recently tagged -for f44. This is because it was built after -https://github.com/rhboot/efi-rpm-macros/commit/5c7fcc9 , so it -appears to be an intentional change - @pjones may confirm. - -Signed-off-by: Adam Williamson ---- - docs/fedora-livemedia.ks | 1 - - share/templates.d/99-generic/efi.tmpl | 3 +++ - share/templates.d/99-generic/live/efi.tmpl | 3 +++ - share/templates.d/99-generic/live/live-install.tmpl | 2 +- - share/templates.d/99-generic/runtime-install.tmpl | 1 - - 5 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks -index 9b779cb4..5ea41079 100644 ---- a/docs/fedora-livemedia.ks -+++ b/docs/fedora-livemedia.ks -@@ -89,7 +89,6 @@ case $ARCH in - echo "%packages" >> $PKGS - echo "@^workstation-product-environment" >> $PKGS - echo "shim" >> $PKGS -- echo "shim-ia32" >> $PKGS - echo "grub2" >> $PKGS - echo "grub2-efi" >> $PKGS - echo "grub2-efi-ia32" >> $PKGS -diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl -index d50c5750..dea00943 100644 ---- a/share/templates.d/99-generic/efi.tmpl -+++ b/share/templates.d/99-generic/efi.tmpl -@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi - %endif - %if efiarch32: -+## shim-ia32 is gone in F44+, other ia32 bits remain for now -+%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): - install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ -+%endif - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif - install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ -diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl -index f1fd1b51..f847ed9f 100644 ---- a/share/templates.d/99-generic/live/efi.tmpl -+++ b/share/templates.d/99-generic/live/efi.tmpl -@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi - %endif - %if efiarch32: -+## shim-ia32 is gone in F44+, other ia32 bits remain for now -+%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): - install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ -+%endif - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif - install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ -diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl -index ef514ee8..61dc5653 100644 ---- a/share/templates.d/99-generic/live/live-install.tmpl -+++ b/share/templates.d/99-generic/live/live-install.tmpl -@@ -10,7 +10,7 @@ - installpkg grub2-tools-efi - installpkg efibootmgr - installpkg shim-x64 grub2-efi-x64-cdboot -- installpkg shim-ia32 grub2-efi-ia32-cdboot -+ installpkg grub2-efi-ia32-cdboot - installpkg biosdevname - installpkg grub2-tools grub2-tools-minimal grub2-tools-extra - installpkg grub2-pc-modules -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index af06d912..94bcfe4e 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -70,7 +70,6 @@ installpkg glibc-all-langpacks - installpkg efibootmgr - installpkg shim-x64 - installpkg grub2-efi-x64-cdboot>=${GRUB2VER} -- installpkg shim-ia32 - installpkg grub2-efi-ia32-cdboot>=${GRUB2VER} - installpkg biosdevname - installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} --- -2.49.0 - diff --git a/lorax.spec b/lorax.spec index 4956459..204d310 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.10 -Release: 5%{?dist} +Version: 44.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,10 +14,6 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} -# https://github.com/weldr/lorax/pull/1489 -# Drop install of shim-ia32 as it no longer exists -Patch: 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -144,7 +140,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup -p1 +%forgeautosetup %build @@ -188,17 +184,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Aug 26 2025 Adam Williamson - 43.10-5 -- Update PR #1489 patch again (fix lmc lives) - -* Tue Aug 26 2025 Adam Williamson - 43.10-4 -- Update PR #1489 patch to a better-working version - -* Tue Aug 26 2025 Adam Williamson - 43.10-3 -- Backport PR #1489 to drop install of shim-ia32 - -* Fri Aug 15 2025 Python Maint - 43.10-2 -- Rebuilt for Python 3.14.0rc2 bytecode +* Mon Sep 08 2025 Brian C. Lane 44.0-1 +- maint: Switch default platform to F44 (bcl@redhat.com) +- Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) +- templates: Support product version to contain blank character in + templates.d/99-generic (songmingliang@uniontech.com) * Thu Aug 14 2025 Brian C. Lane 43.10-1 - executils: Remove binary_output flag (bcl@redhat.com) diff --git a/sources b/sources index 6581651..981565c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.10.tar.gz) = ed8fe9f3e71f358fbaf0d0761838a82e44944e1823e515bffcb78f88e77b0ce457fb1df723af8848ddaabdccc32ef74383cb2b4f9dd9f2b5d0edef685bea27c5 +SHA512 (lorax-44.0.tar.gz) = 3ee05ea7128ec751449578ecd21a1cf4486a57370ef775912f0a83120b0c96d63a3e303d68237c1e68623fbc3af0e730fdac5ba354469ccb0036b6edb4b52e27 From 4c389ef5bc67477e3bc5cccbff1720729079a417 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:29:12 +0200 Subject: [PATCH 05/13] Rebuilt for Python 3.14.0rc3 bytecode --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 204d310..abaa566 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 44.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Sep 19 2025 Python Maint - 44.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Mon Sep 08 2025 Brian C. Lane 44.0-1 - maint: Switch default platform to F44 (bcl@redhat.com) - Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) From b433644a3a25bb9a4d3674f480734389fffdb2d3 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 22 Sep 2025 09:12:13 -0700 Subject: [PATCH 06/13] - Rebuilt for Python 3.14.0rc3 bytecode --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 86c313f..e2685a9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Sep 22 2025 Brian C. Lane - 43.10-3 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 43.10-2 - Rebuilt for Python 3.14.0rc2 bytecode From c16c80094da73de51fea9ec05b93068e3729bbbc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 24 Sep 2025 11:12:06 -0700 Subject: [PATCH 07/13] - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) - executils: decoding after deserialization (oleg.sviridov@red-soft.ru) - mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) --- .gitignore | 1 + lorax.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d7a36c..5498092 100644 --- a/.gitignore +++ b/.gitignore @@ -264,3 +264,4 @@ /lorax-43.9.tar.gz /lorax-43.10.tar.gz /lorax-44.0.tar.gz +/lorax-44.1.tar.gz diff --git a/lorax.spec b/lorax.spec index abaa566..ce57043 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.0 -Release: 2%{?dist} +Version: 44.1 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,8 +184,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Sep 19 2025 Python Maint - 44.0-2 -- Rebuilt for Python 3.14.0rc3 bytecode +* Wed Sep 24 2025 Brian C. Lane 44.1-1 +- runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) +- executils: decoding after deserialization (oleg.sviridov@red-soft.ru) +- mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) * Mon Sep 08 2025 Brian C. Lane 44.0-1 - maint: Switch default platform to F44 (bcl@redhat.com) diff --git a/sources b/sources index 981565c..ed94313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.0.tar.gz) = 3ee05ea7128ec751449578ecd21a1cf4486a57370ef775912f0a83120b0c96d63a3e303d68237c1e68623fbc3af0e730fdac5ba354469ccb0036b6edb4b52e27 +SHA512 (lorax-44.1.tar.gz) = 049605af8d8ef18dd7e976b72d536deb3165bf7b3fa0abe73cbfae242cf2f8346ed25f33704d1216ee5ff7df695070bd79baf86cc7765add5366e869df398017 From fe44b36366112328d1ea30b0c40e5b0016f6b340 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 24 Sep 2025 11:15:58 -0700 Subject: [PATCH 08/13] - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 11 ++++------- sources | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 82cac26..9fa627f 100644 --- a/.gitignore +++ b/.gitignore @@ -263,3 +263,4 @@ /lorax-43.8.tar.gz /lorax-43.9.tar.gz /lorax-43.10.tar.gz +/lorax-43.11.tar.gz diff --git a/lorax.spec b/lorax.spec index e2685a9..cf79a52 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.10 -Release: 3%{?dist} +Version: 43.11 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,11 +184,8 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Sep 22 2025 Brian C. Lane - 43.10-3 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 43.10-2 -- Rebuilt for Python 3.14.0rc2 bytecode +* Wed Sep 24 2025 Brian C. Lane 43.11-1 +- runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) * Thu Aug 14 2025 Brian C. Lane 43.10-1 - executils: Remove binary_output flag (bcl@redhat.com) diff --git a/sources b/sources index 6581651..b5c6429 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.10.tar.gz) = ed8fe9f3e71f358fbaf0d0761838a82e44944e1823e515bffcb78f88e77b0ce457fb1df723af8848ddaabdccc32ef74383cb2b4f9dd9f2b5d0edef685bea27c5 +SHA512 (lorax-43.11.tar.gz) = dfc9f77da7f756360afcdf9832fb13fef2f975a0aa45c91d3824529044892f0bcceb0359de9664800ee7c9826c61a9ee89ad8603cf15cc9e2d85eb903eadd577 From 9f67e97e6b96b0bafbc4d5de9434c10d22e74472 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 25 Sep 2025 09:36:21 -0700 Subject: [PATCH 09/13] tests: Pass release 43 instead of rawhide for test build --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index cf79a52..701327f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Sep 25 2025 Brian C. Lane - 43.11-2 +- Pass 43 to CI testing so it uses the correct repository + * Wed Sep 24 2025 Brian C. Lane 43.11-1 - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index f4849b2..caf0e72 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -254,7 +254,7 @@ fi # Run lorax using the host's repository configuration file if [ ! -e "$BOOTISO" ]; then running "Build boot.iso with lorax" - lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + lorax --product="Fedora" --version=43 --release=43 --volid="Fedora-43-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi From f46393ae32461a10a936776532ef3eea7b0ca630 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 3 Oct 2025 15:14:02 -0700 Subject: [PATCH 10/13] Backport PR #1495 to drop tigervnc from installer images --- 0001-runtime-install-drop-tigervnc.patch | 31 ++++++++++++++++++++++++ lorax.spec | 11 +++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 0001-runtime-install-drop-tigervnc.patch diff --git a/0001-runtime-install-drop-tigervnc.patch b/0001-runtime-install-drop-tigervnc.patch new file mode 100644 index 0000000..76424cd --- /dev/null +++ b/0001-runtime-install-drop-tigervnc.patch @@ -0,0 +1,31 @@ +From 2892e1edcea0d92ce09a573822b4d42799eedd8f Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 2 Oct 2025 12:07:50 -0700 +Subject: [PATCH] runtime-install: drop tigervnc + +anaconda dropped VNC support in +https://github.com/rhinstaller/anaconda/pull/5829 . There is no +point to having these any more, and they pull Xorg and its deps +into the image unnecessarily. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 6ed14fdc..49545065 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -122,8 +122,6 @@ installpkg selinux-policy-targeted audit + + ## network tools/servers + installpkg ethtool openssh-server nfs-utils openssh-clients +-installpkg tigervnc-server-minimal +-installpkg tigervnc-server-module + installpkg net-tools + installpkg bridge-utils + installpkg nmap-ncat +-- +2.51.0 + diff --git a/lorax.spec b/lorax.spec index 701327f..5213595 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} +# https://github.com/weldr/lorax/pull/1495 +# drop tigervnc to save space, anaconda now uses RDP +Patch: 0001-runtime-install-drop-tigervnc.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -140,7 +144,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup +%forgeautosetup -p1 %build @@ -184,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Oct 03 2025 Adam Williamson - 43.11-3 +- Backport PR #1495 to drop tigervnc from installer images + * Thu Sep 25 2025 Brian C. Lane - 43.11-2 - Pass 43 to CI testing so it uses the correct repository From c9a8107ab8c9f1e096853dd3ab7f7ef8b763a9f0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 9 Oct 2025 14:26:18 -0700 Subject: [PATCH 11/13] - Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) - runtime-install: drop tigervnc (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5498092..c62ec26 100644 --- a/.gitignore +++ b/.gitignore @@ -265,3 +265,4 @@ /lorax-43.10.tar.gz /lorax-44.0.tar.gz /lorax-44.1.tar.gz +/lorax-44.2.tar.gz diff --git a/lorax.spec b/lorax.spec index ce57043..3e77c9e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.1 +Version: 44.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Oct 09 2025 Brian C. Lane 44.2-1 +- Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) +- runtime-install: drop tigervnc (awilliam@redhat.com) + * Wed Sep 24 2025 Brian C. Lane 44.1-1 - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) - executils: decoding after deserialization (oleg.sviridov@red-soft.ru) diff --git a/sources b/sources index ed94313..b439063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.1.tar.gz) = 049605af8d8ef18dd7e976b72d536deb3165bf7b3fa0abe73cbfae242cf2f8346ed25f33704d1216ee5ff7df695070bd79baf86cc7765add5366e869df398017 +SHA512 (lorax-44.2.tar.gz) = ce15f772529601cfc261092ab271c1fa4b0eb2f2836edaef8661758cfb4cb63226ca615a31739bc5845b594e74eac8a39e1af2504a908ef83bef02196b5e866b From 8a68c3e72f2fe6e9ed5d5ff592a2996f5b3099c7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 15 Oct 2025 09:50:47 -0700 Subject: [PATCH 12/13] - Do not remove SELinux from the runtime (ppolawsk@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c62ec26..d472f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -266,3 +266,4 @@ /lorax-44.0.tar.gz /lorax-44.1.tar.gz /lorax-44.2.tar.gz +/lorax-44.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 3e77c9e..b364671 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.2 +Version: 44.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Oct 15 2025 Brian C. Lane 44.3-1 +- Do not remove SELinux from the runtime (ppolawsk@redhat.com) + * Thu Oct 09 2025 Brian C. Lane 44.2-1 - Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) - runtime-install: drop tigervnc (awilliam@redhat.com) diff --git a/sources b/sources index b439063..ff805d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.2.tar.gz) = ce15f772529601cfc261092ab271c1fa4b0eb2f2836edaef8661758cfb4cb63226ca615a31739bc5845b594e74eac8a39e1af2504a908ef83bef02196b5e866b +SHA512 (lorax-44.3.tar.gz) = 1d68e10c911bb4d34048a6d7e110a4b17a7f2d009091901fc6efd397a41af2b8f2050ec143190c75371e8e7a6c1a8be7aa407f4ae6641fe7f36a9841bb1069aa From 6866a83666b76c23339d7d3bd9a8ecc4069d588b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 1 Dec 2025 13:28:31 -0800 Subject: [PATCH 13/13] - Exclude build on the i686 architecture (berrange@redhat.com) - runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d472f9e..4ca59af 100644 --- a/.gitignore +++ b/.gitignore @@ -267,3 +267,4 @@ /lorax-44.1.tar.gz /lorax-44.2.tar.gz /lorax-44.3.tar.gz +/lorax-44.4.tar.gz diff --git a/lorax.spec b/lorax.spec index b364671..5e3eaa4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,11 +4,14 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.3 +Version: 44.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later +# qemu is no longer available on 32-bit +ExcludeArch: %{ix86} + %global tag %{version} %forgemeta Url: %{forgeurl} @@ -184,6 +187,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 01 2025 Brian C. Lane 44.4-1 +- Exclude build on the i686 architecture (berrange@redhat.com) +- runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) + +* Wed Nov 26 2025 Daniel P. Berrangé - 44.3-2 +- Add ExcludeArch for i686 to remove qemu dependency + * Wed Oct 15 2025 Brian C. Lane 44.3-1 - Do not remove SELinux from the runtime (ppolawsk@redhat.com) diff --git a/sources b/sources index ff805d7..0b5f402 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.3.tar.gz) = 1d68e10c911bb4d34048a6d7e110a4b17a7f2d009091901fc6efd397a41af2b8f2050ec143190c75371e8e7a6c1a8be7aa407f4ae6641fe7f36a9841bb1069aa +SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577