From 5d0cac6a9d6a34c5c91bbd7d261e2a3df39a79f8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 9 Sep 2024 09:15:22 -0700 Subject: [PATCH 01/31] - New lorax documentation - 41.3 (bcl@redhat.com) - ltmpl: Remove * from docstring (bcl@redhat.com) - docs: Update intersphinx and add _static dir (bcl@redhat.com) - docs: Document --rootfs-type options (bcl@redhat.com) - Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) - creator: Change rootfs description to match cmdline argument (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 24477b5..3accf14 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,4 @@ /lorax-41.1.tar.gz /lorax-41.2.tar.gz /lorax-41.3.tar.gz +/lorax-42.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 1fbe0fe..da7fee4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.3 -Release: 2%{?dist} +Version: 42.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,8 +171,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 41.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Mon Sep 09 2024 Brian C. Lane 42.0-1 +- New lorax documentation - 41.3 (bcl@redhat.com) +- ltmpl: Remove * from docstring (bcl@redhat.com) +- docs: Update intersphinx and add _static dir (bcl@redhat.com) +- docs: Document --rootfs-type options (bcl@redhat.com) +- Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) +- creator: Change rootfs description to match cmdline argument (bcl@redhat.com) * Tue Jul 16 2024 Brian C. Lane 41.3-1 - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) diff --git a/sources b/sources index dd876cb..a8e9fb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff +SHA512 (lorax-42.0.tar.gz) = ffc76179b0ec92191773b60e82c4b6cc7be452d3d071dce49d6b271fc94d7573fdede33c2280b50bfe8157ddd52a7ec14323de3e9485de805a17c44438bd6ac4 From a80bdcb40d155248bcbb4cf63e276e82e075c64f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Sep 2024 11:04:01 -0700 Subject: [PATCH 02/31] - templates: Drop dnf install (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3accf14..b09c9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /lorax-41.2.tar.gz /lorax-41.3.tar.gz /lorax-42.0.tar.gz +/lorax-42.1.tar.gz diff --git a/lorax.spec b/lorax.spec index da7fee4..a66d47e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.0 +Version: 42.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Sep 30 2024 Brian C. Lane 42.1-1 +- templates: Drop dnf install (bcl@redhat.com) + * Mon Sep 09 2024 Brian C. Lane 42.0-1 - New lorax documentation - 41.3 (bcl@redhat.com) - ltmpl: Remove * from docstring (bcl@redhat.com) diff --git a/sources b/sources index a8e9fb6..2706592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.0.tar.gz) = ffc76179b0ec92191773b60e82c4b6cc7be452d3d071dce49d6b271fc94d7573fdede33c2280b50bfe8157ddd52a7ec14323de3e9485de805a17c44438bd6ac4 +SHA512 (lorax-42.1.tar.gz) = 885e0e1246af1829bcefde9a99fbdb35c2e6281344d8ab0634546473fc669d06a53863e9aebbfe0b8ee1d83c924ec0534efad82549d852981c032cf3f77bb485 From 032c0d9324ae40cdbebcef56cbc869d68037c82a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:02:21 -0700 Subject: [PATCH 03/31] tests: Update the updates.img test for changes in lorax-42.2 The updates.img is now places in the / of the iso and inst.updates is now used on the cmdline. --- tests/scripts/run_tests.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index ce3c4ed..f4849b2 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -186,8 +186,8 @@ function add_updatesimg { running "Add updates.img" # nothing in the file, just test that it is there - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_updatesimg @@ -197,15 +197,17 @@ function add_updatesimg { } function test_updatesimg { - [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso" + [ -e "$ISODIR/updates.img" ] || fail "Missing updates.img file from iso" + grep "inst.updates=.*updates.img" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg inst.updates entry" + grep "inst.updates=.*updates.img" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg inst.updates entry" } # All of the changes function run_all { running "Use all the options" - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -224,8 +226,8 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - touch /tmp/test-updates.img - su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + touch /tmp/updates.img + su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks From 4e760a153dc1fb079cc6a66b76e91dbcb2956f72 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:10:01 -0700 Subject: [PATCH 04/31] - pylint: Print astroid version (bcl@redhat.com) - Extend help for --updates and --ks parameters (jkonecny@redhat.com) - Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b09c9e9..98a5b46 100644 --- a/.gitignore +++ b/.gitignore @@ -248,3 +248,4 @@ /lorax-41.3.tar.gz /lorax-42.0.tar.gz /lorax-42.1.tar.gz +/lorax-42.2.tar.gz diff --git a/lorax.spec b/lorax.spec index a66d47e..e0693ad 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.1 +Version: 42.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 08 2024 Brian C. Lane 42.2-1 +- pylint: Print astroid version (bcl@redhat.com) +- Extend help for --updates and --ks parameters (jkonecny@redhat.com) +- Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) + * Mon Sep 30 2024 Brian C. Lane 42.1-1 - templates: Drop dnf install (bcl@redhat.com) diff --git a/sources b/sources index 2706592..82ee5dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.1.tar.gz) = 885e0e1246af1829bcefde9a99fbdb35c2e6281344d8ab0634546473fc669d06a53863e9aebbfe0b8ee1d83c924ec0534efad82549d852981c032cf3f77bb485 +SHA512 (lorax-42.2.tar.gz) = 9691c55128fab5210caf9645aaea4bec30598389e35c9ff35727ba5d6e45bf75f9b8dd1a48cd74bdbe794dfe90b97311d4c2d330d1c0430b99e9a3975eec25ea From 627361a13afca474d45b3ef01379e306f5b05fb0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 21 Oct 2024 10:45:13 -0700 Subject: [PATCH 05/31] - Update template for anaconda webui to start as user (adamkankovsky@gmail.com) - tests: Fix mkksiso unit test (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 98a5b46..a51a455 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /lorax-42.0.tar.gz /lorax-42.1.tar.gz /lorax-42.2.tar.gz +/lorax-42.3.tar.gz diff --git a/lorax.spec b/lorax.spec index e0693ad..64e5eab 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.2 +Version: 42.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Oct 21 2024 Brian C. Lane 42.3-1 +- Update template for anaconda webui to start as user (adamkankovsky@gmail.com) +- tests: Fix mkksiso unit test (bcl@redhat.com) + * Tue Oct 08 2024 Brian C. Lane 42.2-1 - pylint: Print astroid version (bcl@redhat.com) - Extend help for --updates and --ks parameters (jkonecny@redhat.com) diff --git a/sources b/sources index 82ee5dd..21d5534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.2.tar.gz) = 9691c55128fab5210caf9645aaea4bec30598389e35c9ff35727ba5d6e45bf75f9b8dd1a48cd74bdbe794dfe90b97311d4c2d330d1c0430b99e9a3975eec25ea +SHA512 (lorax-42.3.tar.gz) = b6d52b1a44c7896e7b0654b9a852428cf7d737a342c57b2336434511428e3fff4a7525d3684951e9d068dabf5929d80edd95f53c8eca3b04c3115a51a482ff3d From e7d54609fb951ca70e762fe9afddebc691bc75e4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 22 Nov 2024 10:58:12 -0800 Subject: [PATCH 06/31] - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - erofs: Change the erofs compression default to zstd (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a51a455..9eb57a2 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /lorax-42.1.tar.gz /lorax-42.2.tar.gz /lorax-42.3.tar.gz +/lorax-42.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 64e5eab..0c112f1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.3 +Version: 42.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -39,7 +39,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 -Requires: erofs-utils +Requires: erofs-utils >= 1.8.2 Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Nov 22 2024 Brian C. Lane 42.4-1 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) +- erofs: Change the erofs compression default to zstd (bcl@redhat.com) + * Mon Oct 21 2024 Brian C. Lane 42.3-1 - Update template for anaconda webui to start as user (adamkankovsky@gmail.com) - tests: Fix mkksiso unit test (bcl@redhat.com) diff --git a/sources b/sources index 21d5534..a092753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.3.tar.gz) = b6d52b1a44c7896e7b0654b9a852428cf7d737a342c57b2336434511428e3fff4a7525d3684951e9d068dabf5929d80edd95f53c8eca3b04c3115a51a482ff3d +SHA512 (lorax-42.4.tar.gz) = 2222afd20298a217e1fab209b2c4b691063b24446c03b7fe0893f5672fcfb6c4020bd740a634ddff28d6d933740e4f3f2c1e469c64d69f0b8bbf716d5dfad2f4 From f3391a5c29ee01045133166508f5d76e2802459b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:00:15 +0000 Subject: [PATCH 07/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 0c112f1..626afa7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 42.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 42.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 22 2024 Brian C. Lane 42.4-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - erofs: Change the erofs compression default to zstd (bcl@redhat.com) From 45d3069dba51b9188b6f20ac5957b5190f268102 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 Feb 2025 09:31:50 -0800 Subject: [PATCH 08/31] - Remove sbin usage (bcl@redhat.com) - mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) - Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) - mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) - Remove leftovers from xorg drop (jkonecny@redhat.com) --- .gitignore | 1 + lorax.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9eb57a2..6c1aa35 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /lorax-42.2.tar.gz /lorax-42.3.tar.gz /lorax-42.4.tar.gz +/lorax-42.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 626afa7..8c25456 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.4 -Release: 2%{?dist} +Version: 42.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -145,9 +145,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/*ks %{python3_sitelib}/pylorax %{python3_sitelib}/*.egg-info -%{_sbindir}/lorax -%{_sbindir}/mkefiboot -%{_sbindir}/livemedia-creator +%{_bindir}/lorax +%{_bindir}/mkefiboot +%{_bindir}/livemedia-creator %{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax @@ -171,8 +171,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Jan 17 2025 Fedora Release Engineering - 42.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Mon Feb 03 2025 Brian C. Lane 42.5-1 +- Remove sbin usage (bcl@redhat.com) +- mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) +- Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) +- mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) +- Remove leftovers from xorg drop (jkonecny@redhat.com) * Fri Nov 22 2024 Brian C. Lane 42.4-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) diff --git a/sources b/sources index a092753..4cb3a3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.4.tar.gz) = 2222afd20298a217e1fab209b2c4b691063b24446c03b7fe0893f5672fcfb6c4020bd740a634ddff28d6d933740e4f3f2c1e469c64d69f0b8bbf716d5dfad2f4 +SHA512 (lorax-42.5.tar.gz) = 377b2e2d1dfa119db668b4ba199ea2d342e44005d84a4235cff2268c309e767e7e4f52f832f07d05caa4bb99e6a03e71c5281e496a5480a7a8aa7077355e6a68 From 1987c526abff074dc8cf74f8b9ec7898fdd2955c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 6 Mar 2025 08:57:50 -0800 Subject: [PATCH 09/31] - maint: Switch default platform to F43 (bcl@redhat.com) - runtime-cleanup: Leave stat binary (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c1aa35..7820e05 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /lorax-42.3.tar.gz /lorax-42.4.tar.gz /lorax-42.5.tar.gz +/lorax-43.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 8c25456..7da823e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.5 +Version: 43.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Mar 06 2025 Brian C. Lane 43.0-1 +- maint: Switch default platform to F43 (bcl@redhat.com) +- runtime-cleanup: Leave stat binary (bcl@redhat.com) + * Mon Feb 03 2025 Brian C. Lane 42.5-1 - Remove sbin usage (bcl@redhat.com) - mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) diff --git a/sources b/sources index 4cb3a3c..0d04b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.5.tar.gz) = 377b2e2d1dfa119db668b4ba199ea2d342e44005d84a4235cff2268c309e767e7e4f52f832f07d05caa4bb99e6a03e71c5281e496a5480a7a8aa7077355e6a68 +SHA512 (lorax-43.0.tar.gz) = 40b37da59c9373d112a3b5530e1779ea92380073edc2ac2102d1483051fe27b7f1dcef4b295df5e1bba3f6af8d1c400da534af5267775378d485d7c21d01a6a9 From d4f1babc54f061dd49c6179e3a156b77cf44c708 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 10 Mar 2025 16:02:39 -0700 Subject: [PATCH 10/31] - runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7820e05..63cc842 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ /lorax-42.4.tar.gz /lorax-42.5.tar.gz /lorax-43.0.tar.gz +/lorax-43.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 7da823e..bc09e6d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.0 +Version: 43.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 10 2025 Brian C. Lane 43.1-1 +- runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) + * Thu Mar 06 2025 Brian C. Lane 43.0-1 - maint: Switch default platform to F43 (bcl@redhat.com) - runtime-cleanup: Leave stat binary (bcl@redhat.com) diff --git a/sources b/sources index 0d04b13..f0b4840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.0.tar.gz) = 40b37da59c9373d112a3b5530e1779ea92380073edc2ac2102d1483051fe27b7f1dcef4b295df5e1bba3f6af8d1c400da534af5267775378d485d7c21d01a6a9 +SHA512 (lorax-43.1.tar.gz) = 378479ad50bdf0277d67dd3390424c48d26518b1918281b423b2d3d1f7d96d9ce0e382234ffbbd79eefe49a9d6775c2b0dbadde44b2971b6410b18e7639ee353 From 3107d46135bce3c1d68aa7a72ea0e7fd3d0f1b0f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 25 Mar 2025 12:51:57 -0700 Subject: [PATCH 11/31] - spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) - livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 24 ++++++++++++++++++++---- sources | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 63cc842..e00b859 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,4 @@ /lorax-42.5.tar.gz /lorax-43.0.tar.gz /lorax-43.1.tar.gz +/lorax-43.2.tar.gz diff --git a/lorax.spec b/lorax.spec index bc09e6d..e2651e4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.1 +Version: 43.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -92,19 +92,29 @@ Requires: lorax = %{version}-%{release} %description docs Includes the full html documentation for lorax, livemedia-creator, and the pylorax library. +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} +%if 0%{?rhel} +# RHEL doesn't have qemu, just qemu-kvm +Requires: qemu-kvm +%else Requires: qemu +Recommends: qemu-kvm +%endif -# Fedora edk2 builds currently only support these arches -%ifarch x86_64 aarch64 +# edk2 builds currently only support these arches +%ifarch x86_64 Requires: edk2-ovmf %endif -Recommends: qemu-kvm +%ifarch aarch64 +Requires: edk2-aarch64 +%endif %description lmc-virt Additional dependencies required by livemedia-creator when using it with qemu. +%endif %package lmc-novirt Summary: livemedia-creator no-virt dependencies @@ -162,7 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files docs %doc docs/html/* +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %files lmc-virt +%endif %files lmc-novirt @@ -171,6 +183,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Mar 25 2025 Brian C. Lane 43.2-1 +- spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) +- livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) + * Mon Mar 10 2025 Brian C. Lane 43.1-1 - runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) diff --git a/sources b/sources index f0b4840..35e1065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.1.tar.gz) = 378479ad50bdf0277d67dd3390424c48d26518b1918281b423b2d3d1f7d96d9ce0e382234ffbbd79eefe49a9d6775c2b0dbadde44b2971b6410b18e7639ee353 +SHA512 (lorax-43.2.tar.gz) = 609430555fcb6421e37b00d42d09ee20bdee1711b7d9189580cd2fb3771f2a5a81ff42498e8c5a1af2a6747fb2d637a82124241fecb82ecd56e0d5a6bbcf67ad From 0615da549b6935f9248df7d6e5ed6c7ecfd4d25a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 31 Mar 2025 14:15:07 -0700 Subject: [PATCH 12/31] - config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) - runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) - runtime-install: exclude crust-firmware (awilliam@redhat.com) - runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) - runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) - runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e00b859..22a7d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ /lorax-43.0.tar.gz /lorax-43.1.tar.gz /lorax-43.2.tar.gz +/lorax-43.3.tar.gz diff --git a/lorax.spec b/lorax.spec index e2651e4..8a66c99 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.2 +Version: 43.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 31 2025 Brian C. Lane 43.3-1 +- config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) +- runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) +- runtime-install: exclude crust-firmware (awilliam@redhat.com) +- runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) +- runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) +- runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) + * Tue Mar 25 2025 Brian C. Lane 43.2-1 - spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) - livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) diff --git a/sources b/sources index 35e1065..4007b55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.2.tar.gz) = 609430555fcb6421e37b00d42d09ee20bdee1711b7d9189580cd2fb3771f2a5a81ff42498e8c5a1af2a6747fb2d637a82124241fecb82ecd56e0d5a6bbcf67ad +SHA512 (lorax-43.3.tar.gz) = f39e7285336256cb645db0fd7b52846195900971fd41ae89482541f34d34d148d68783e33e4845f2182af5f45e13534bf6a08b7c8d368ce51e7d6a9fa2bcd18b From 0a66eb9692c3f3e36b43a07e190f471125b0efd4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 6 May 2025 09:23:36 -0700 Subject: [PATCH 13/31] - runtime-postinstall: Remove root password (bcl@redhat.com) Resolves: rhbz#2364082 - tests: Update magic module usage (bcl@redhat.com) - utils: Remove old filediff.py script (bcl@redhat.com) - dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) Fixes #1464 --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 22a7d2c..080609d 100644 --- a/.gitignore +++ b/.gitignore @@ -256,3 +256,4 @@ /lorax-43.1.tar.gz /lorax-43.2.tar.gz /lorax-43.3.tar.gz +/lorax-43.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 8a66c99..13d6d8f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.3 +Version: 43.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue May 06 2025 Brian C. Lane 43.4-1 +- runtime-postinstall: Remove root password (bcl@redhat.com) + Resolves: rhbz#2364082 +- tests: Update magic module usage (bcl@redhat.com) +- utils: Remove old filediff.py script (bcl@redhat.com) +- dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) + Fixes #1464 + * Mon Mar 31 2025 Brian C. Lane 43.3-1 - config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) - runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) diff --git a/sources b/sources index 4007b55..9bd24ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.3.tar.gz) = f39e7285336256cb645db0fd7b52846195900971fd41ae89482541f34d34d148d68783e33e4845f2182af5f45e13534bf6a08b7c8d368ce51e7d6a9fa2bcd18b +SHA512 (lorax-43.4.tar.gz) = 6d6a7781c5ad0a43da825dc6791634861c64cc36401ade6d4743452b5c15703833e141f3fc8ba3046187b81e49d9a86cc103f17c5a54e05efaf8d72b70440b34 From c6d1e103bb0c4b2e2f21da15fb1ebb18e43abf32 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:57:37 +0200 Subject: [PATCH 14/31] Rebuilt for Python 3.14 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 13d6d8f..f3e78b6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jun 02 2025 Python Maint - 43.4-2 +- Rebuilt for Python 3.14 + * Tue May 06 2025 Brian C. Lane 43.4-1 - runtime-postinstall: Remove root password (bcl@redhat.com) Resolves: rhbz#2364082 From 1180a83399c3798058e4e56a7b66bce7b206b241 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 16 Jun 2025 11:39:48 -0700 Subject: [PATCH 15/31] - templates.d: Remove libdir variable from templates (bcl@redhat.com) - runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 080609d..0fba9db 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,4 @@ /lorax-43.2.tar.gz /lorax-43.3.tar.gz /lorax-43.4.tar.gz +/lorax-43.5.tar.gz diff --git a/lorax.spec b/lorax.spec index f3e78b6..84520e1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.4 -Release: 2%{?dist} +Version: 43.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,8 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jun 02 2025 Python Maint - 43.4-2 -- Rebuilt for Python 3.14 +* Mon Jun 16 2025 Brian C. Lane 43.5-1 +- templates.d: Remove libdir variable from templates (bcl@redhat.com) +- runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) * Tue May 06 2025 Brian C. Lane 43.4-1 - runtime-postinstall: Remove root password (bcl@redhat.com) diff --git a/sources b/sources index 9bd24ca..98c427f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.4.tar.gz) = 6d6a7781c5ad0a43da825dc6791634861c64cc36401ade6d4743452b5c15703833e141f3fc8ba3046187b81e49d9a86cc103f17c5a54e05efaf8d72b70440b34 +SHA512 (lorax-43.5.tar.gz) = 9a39a198c47bc9091e2ce68f280e863bbfcf3f28ebe439c348f8aed5dd02b0f03a4eb72bd9da406d14b32304ffdc53fec7d4c0ed014d648ca7ed3f3dfa182485 From 413e22a967f509223a8be75a7770498c48e628f2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Jul 2025 11:24:27 -0700 Subject: [PATCH 16/31] - config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) - use /mnt/sysroot PATH in profile (butirsky@gmail.com) - fix chroot path in .bash_history (butirsky@gmail.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0fba9db..f66c01e 100644 --- a/.gitignore +++ b/.gitignore @@ -258,3 +258,4 @@ /lorax-43.3.tar.gz /lorax-43.4.tar.gz /lorax-43.5.tar.gz +/lorax-43.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 84520e1..fb7c3d5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.5 +Version: 43.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jul 02 2025 Brian C. Lane 43.6-1 +- config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) +- use /mnt/sysroot PATH in profile (butirsky@gmail.com) +- fix chroot path in .bash_history (butirsky@gmail.com) + * Mon Jun 16 2025 Brian C. Lane 43.5-1 - templates.d: Remove libdir variable from templates (bcl@redhat.com) - runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) diff --git a/sources b/sources index 98c427f..647477a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.5.tar.gz) = 9a39a198c47bc9091e2ce68f280e863bbfcf3f28ebe439c348f8aed5dd02b0f03a4eb72bd9da406d14b32304ffdc53fec7d4c0ed014d648ca7ed3f3dfa182485 +SHA512 (lorax-43.6.tar.gz) = 22ba9712831ee91ed0601b2c71cd76145b9be2ac531c02383672759e243fd77b9ccf4b75df989f71614f53a2605450f850083b2d4fefc8bb04666a01f895ba2e From 3bc541029b5937110a3717f4b1a5500c7ebf292e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 11 Jul 2025 09:26:11 -0700 Subject: [PATCH 17/31] - runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) - treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f66c01e..a9b1094 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,4 @@ /lorax-43.4.tar.gz /lorax-43.5.tar.gz /lorax-43.6.tar.gz +/lorax-43.7.tar.gz diff --git a/lorax.spec b/lorax.spec index fb7c3d5..ebaa796 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.6 +Version: 43.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jul 11 2025 Brian C. Lane 43.7-1 +- runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) +- treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) + * Wed Jul 02 2025 Brian C. Lane 43.6-1 - config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) - use /mnt/sysroot PATH in profile (butirsky@gmail.com) diff --git a/sources b/sources index 647477a..4ae5fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.6.tar.gz) = 22ba9712831ee91ed0601b2c71cd76145b9be2ac531c02383672759e243fd77b9ccf4b75df989f71614f53a2605450f850083b2d4fefc8bb04666a01f895ba2e +SHA512 (lorax-43.7.tar.gz) = 957e759ff518b9c7c977170ef1cbec91b63b42e160989a1bf6ebad999d6da52d7caf0744bcbb648ec5b1e10189da48916cf1b68db058566b5a4708cd2b58a3bd From e8f98cb9be4d21ae2e89e5efd2239bac1c741d5f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 15 Jul 2025 14:08:47 -0700 Subject: [PATCH 18/31] - pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) - tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) - lorax.spec: Update for pyproject.toml use (bcl@redhat.com) - pyproject: Add cmdline scripts (bcl@redhat.com) - bin: symlink to scripts from src/bin (bcl@redhat.com) - Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) - pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) - pyproject: Add a pyproject.toml config file (bcl@redhat.com) - Makefile: Stop running setup.py directly (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 17 +++++++++++++++-- sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a9b1094..edc5ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ /lorax-43.5.tar.gz /lorax-43.6.tar.gz /lorax-43.7.tar.gz +/lorax-43.8.tar.gz diff --git a/lorax.spec b/lorax.spec index ebaa796..fe5dd6b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.7 +Version: 43.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,7 +14,9 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} +BuildRequires: python3-build BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -154,7 +156,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks %{python3_sitelib}/pylorax -%{python3_sitelib}/*.egg-info +%{python3_sitelib}/pylorax-%{version}.dist-info %{_bindir}/lorax %{_bindir}/mkefiboot %{_bindir}/livemedia-creator @@ -183,6 +185,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 15 2025 Brian C. Lane 43.8-1 +- pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) +- tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) +- lorax.spec: Update for pyproject.toml use (bcl@redhat.com) +- pyproject: Add cmdline scripts (bcl@redhat.com) +- bin: symlink to scripts from src/bin (bcl@redhat.com) +- Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) +- pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) +- pyproject: Add a pyproject.toml config file (bcl@redhat.com) +- Makefile: Stop running setup.py directly (bcl@redhat.com) + * Fri Jul 11 2025 Brian C. Lane 43.7-1 - runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) - treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) diff --git a/sources b/sources index 4ae5fda..e5d24e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.7.tar.gz) = 957e759ff518b9c7c977170ef1cbec91b63b42e160989a1bf6ebad999d6da52d7caf0744bcbb648ec5b1e10189da48916cf1b68db058566b5a4708cd2b58a3bd +SHA512 (lorax-43.8.tar.gz) = 05697aacd70396dc236a029597fcec14039df05aa3b59fca7a424baded0b78362d526d640be794db93995a73d09853e19824ca4abbaae7571ecf17b7f736a968 From bb10ea5e9221ce3dbff1a7a9640f62a7817e0b0e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 22 Jul 2025 16:06:06 -0700 Subject: [PATCH 19/31] - Makefile: Separate install and all targets (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index edc5ff5..c52c621 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,4 @@ /lorax-43.6.tar.gz /lorax-43.7.tar.gz /lorax-43.8.tar.gz +/lorax-43.9.tar.gz diff --git a/lorax.spec b/lorax.spec index fe5dd6b..9144c95 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.8 +Version: 43.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,7 +14,6 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} -BuildRequires: python3-build BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -185,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 22 2025 Brian C. Lane 43.9-1 +- Makefile: Separate install and all targets (bcl@redhat.com) + * Tue Jul 15 2025 Brian C. Lane 43.8-1 - pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) - tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) diff --git a/sources b/sources index e5d24e3..fb4ffaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.8.tar.gz) = 05697aacd70396dc236a029597fcec14039df05aa3b59fca7a424baded0b78362d526d640be794db93995a73d09853e19824ca4abbaae7571ecf17b7f736a968 +SHA512 (lorax-43.9.tar.gz) = 7f375722fa0c292a4057914d2ca28a18ff8a8a5bfab5596b1c598076d99e8748f6f543c493026678554aa73c2a9a66f8f413296fa60abcf6bb9970d6aa95373b From 90b2a4f327e4c8f5eb9b8956aa8f3e044c7e1c9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:51:55 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 9144c95..3cbdf5b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.9 -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 Jul 24 2025 Fedora Release Engineering - 43.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Brian C. Lane 43.9-1 - Makefile: Separate install and all targets (bcl@redhat.com) From e29e59a3c039349f911f4d320a7c6ac111737ed7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 14 Aug 2025 11:39:21 -0700 Subject: [PATCH 21/31] - executils: Remove binary_output flag (bcl@redhat.com) - logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) - executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) - tests: Add template runcmd unicode test (bcl@redhat.com) - tests: Add some unicode to the executils tests (bcl@redhat.com) - templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c52c621..82cac26 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,4 @@ /lorax-43.7.tar.gz /lorax-43.8.tar.gz /lorax-43.9.tar.gz +/lorax-43.10.tar.gz diff --git a/lorax.spec b/lorax.spec index 3cbdf5b..4b36d62 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.9 -Release: 2%{?dist} +Version: 43.10 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,8 +184,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 43.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Thu Aug 14 2025 Brian C. Lane 43.10-1 +- executils: Remove binary_output flag (bcl@redhat.com) +- logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) +- executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) +- tests: Add template runcmd unicode test (bcl@redhat.com) +- tests: Add some unicode to the executils tests (bcl@redhat.com) +- templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) * Tue Jul 22 2025 Brian C. Lane 43.9-1 - Makefile: Separate install and all targets (bcl@redhat.com) diff --git a/sources b/sources index fb4ffaf..6581651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.9.tar.gz) = 7f375722fa0c292a4057914d2ca28a18ff8a8a5bfab5596b1c598076d99e8748f6f543c493026678554aa73c2a9a66f8f413296fa60abcf6bb9970d6aa95373b +SHA512 (lorax-43.10.tar.gz) = ed8fe9f3e71f358fbaf0d0761838a82e44944e1823e515bffcb78f88e77b0ce457fb1df723af8848ddaabdccc32ef74383cb2b4f9dd9f2b5d0edef685bea27c5 From a39c12a88509736e8acf469c0d10295062cdd8c1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:58:31 +0200 Subject: [PATCH 22/31] Rebuilt for Python 3.14.0rc2 bytecode --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 4b36d62..86c313f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -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 Aug 15 2025 Python Maint - 43.10-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Aug 14 2025 Brian C. Lane 43.10-1 - executils: Remove binary_output flag (bcl@redhat.com) - logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) From f3396b8406e321da470aafaf1090f9ac79d58be1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 09:28:50 -0700 Subject: [PATCH 23/31] 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 24/31] 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 25/31] 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 26/31] - 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 27/31] 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 c16c80094da73de51fea9ec05b93068e3729bbbc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 24 Sep 2025 11:12:06 -0700 Subject: [PATCH 28/31] - 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 c9a8107ab8c9f1e096853dd3ab7f7ef8b763a9f0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 9 Oct 2025 14:26:18 -0700 Subject: [PATCH 29/31] - 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 30/31] - 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 31/31] - 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