From 0149aa37ff468177942c1dfd343d59ad22b8dd52 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 9 Sep 2024 09:19:56 -0700 Subject: [PATCH 1/6] - 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) - creator: Change rootfs description to match cmdline argument (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 24477b5..2b61c73 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-41.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 1fbe0fe..0482321 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: 41.4 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,8 +171,12 @@ 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 41.4-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) +- 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..0e6f109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff +SHA512 (lorax-41.4.tar.gz) = df4cb341aa578270bbc189da2f7506834ddf48cb5721239087924ae216701d8957e3cdad09a7273b0911a0f010e7e26d069bc7af5e8ecae458257190574c6207 From 6b4b2f7db44201b5a4200b8ea6868c20081f1471 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Sep 2024 11:14:20 -0700 Subject: [PATCH 2/6] - 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 2b61c73..9d6a101 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /lorax-41.2.tar.gz /lorax-41.3.tar.gz /lorax-41.4.tar.gz +/lorax-41.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 0482321..f62a315 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.4 +Version: 41.5 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 41.5-1 +- templates: Drop dnf install (bcl@redhat.com) + * Mon Sep 09 2024 Brian C. Lane 41.4-1 - New lorax documentation - 41.3 (bcl@redhat.com) - ltmpl: Remove * from docstring (bcl@redhat.com) diff --git a/sources b/sources index 0e6f109..1d0dd8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.4.tar.gz) = df4cb341aa578270bbc189da2f7506834ddf48cb5721239087924ae216701d8957e3cdad09a7273b0911a0f010e7e26d069bc7af5e8ecae458257190574c6207 +SHA512 (lorax-41.5.tar.gz) = b76b11d4f791a37774f2a8915c387e900ce95ca20eb9c9422d29902ba7d51e339a0a387ab353a57dd4e2f2d0a63763a9e0ef419c805a367e40cc7356bcae671a From 64b4d567b17d22f1547d18b418d91e81493e2be9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:02:21 -0700 Subject: [PATCH 3/6] 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 1d67c0488eaa25edaca058dff139783c12023e3c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 12:44:26 -0700 Subject: [PATCH 4/6] - tests: Fix mkksiso unit test (bcl@redhat.com) - test: Use fedora:41 for test-in-podman (bcl@redhat.com) - 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 | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d6a101..fb02f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -248,3 +248,4 @@ /lorax-41.3.tar.gz /lorax-41.4.tar.gz /lorax-41.5.tar.gz +/lorax-41.6.tar.gz diff --git a/lorax.spec b/lorax.spec index f62a315..658092c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.5 +Version: 41.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 08 2024 Brian C. Lane 41.6-1 +- tests: Fix mkksiso unit test (bcl@redhat.com) +- test: Use fedora:41 for test-in-podman (bcl@redhat.com) +- 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 41.5-1 - templates: Drop dnf install (bcl@redhat.com) diff --git a/sources b/sources index 1d0dd8f..161b0fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.5.tar.gz) = b76b11d4f791a37774f2a8915c387e900ce95ca20eb9c9422d29902ba7d51e339a0a387ab353a57dd4e2f2d0a63763a9e0ef419c805a367e40cc7356bcae671a +SHA512 (lorax-41.6.tar.gz) = 95aa11f6e3f4481ea678e15decb82d403d812f0cf010cf0676a6e8a2aae05d38aefa4132297af582b1ed448b8697ad43c703d5cbfecbdede73305f86dbd38b3c From 3bced4706502078f6b60dfbd98e7b4aaa3b672e8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 22 Nov 2024 11:04:25 -0800 Subject: [PATCH 5/6] - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fb02f3b..4279507 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /lorax-41.4.tar.gz /lorax-41.5.tar.gz /lorax-41.6.tar.gz +/lorax-41.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 658092c..c17b415 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.6 +Version: 41.7 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 +* Fri Nov 22 2024 Brian C. Lane 41.7-1 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) + * Tue Oct 08 2024 Brian C. Lane 41.6-1 - tests: Fix mkksiso unit test (bcl@redhat.com) - test: Use fedora:41 for test-in-podman (bcl@redhat.com) diff --git a/sources b/sources index 161b0fb..efc87b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.6.tar.gz) = 95aa11f6e3f4481ea678e15decb82d403d812f0cf010cf0676a6e8a2aae05d38aefa4132297af582b1ed448b8697ad43c703d5cbfecbdede73305f86dbd38b3c +SHA512 (lorax-41.7.tar.gz) = 1f6738aa72bc0a1969d12e50c8c1bff225a62f565a62cfa12e8d4cf9c4c119db794d7c49259dd73ef660b73f0512c33d8bc4d86d0072bd67b1c193e0057d4a80 From a252a751d8e2b3985a94ecfa4f115f7b3030ca06 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Nov 2024 10:29:09 -0800 Subject: [PATCH 6/6] tests: Set release to 41 instead of rawhide This gets passed to dnf for use in the $releasever substitution for repo urls, resulting in it using the wrong repos for the test. --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index c17b415..131e83e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 41.7 -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 +* Mon Nov 25 2024 Brian C. Lane - 41.7-2 +- tests: Set release to 41 instead of rawhide (bcl) + * Fri Nov 22 2024 Brian C. Lane 41.7-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index f4849b2..246431d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -241,8 +241,6 @@ function run_as_user { umount_dirs } - - # Gather up the list of system repo files and use them for lorax REPOS=$(for f in /etc/yum.repos.d/*repo; do echo -n "--repo $f "; done) if [ -z "$REPOS" ]; then @@ -254,7 +252,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=41 --release=41 --volid="Fedora-41-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi