From 1c9d1f2f55a947ae02014714a1950134ad763106 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 26 Mar 2024 14:19:48 -0700 Subject: [PATCH 1/5] - runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9dcd8a7..b6e221c 100644 --- a/.gitignore +++ b/.gitignore @@ -242,3 +242,4 @@ /lorax-40.4.tar.gz /lorax-40.5.tar.gz /lorax-40.6.tar.gz +/lorax-40.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 3a87f04..71322dd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.6 +Version: 40.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Mar 26 2024 Brian C. Lane 40.7-1 +- runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) + * Mon Feb 19 2024 Brian C. Lane - Add example use of lmc in github actions. (cjshowalter@alaska.edu) - Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com) diff --git a/sources b/sources index f5a1c9f..0493260 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577 +SHA512 (lorax-40.7.tar.gz) = e6cc816d35f3ed04065e50386c43f25150ecada5146102dddbcb4bad448f10d45e9df9e96a3a11c8dc0d9cc4333e6117410d247794fe4d36b86e34c5c3b76e60 From f767c8738e0a3cd063bcf3ad1a9d165ba2a678f1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:02:21 -0700 Subject: [PATCH 2/5] 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 129b20d151e7584093c9e0072454579e04217ac2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 13:07:08 -0700 Subject: [PATCH 3/5] - creator: Fix pylint error in run_creator (bcl@redhat.com) - tests: Fix mkksiso unit test (bcl@redhat.com) - test: Use fedora:40 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) - Implement --replace also for S390 (sebastian.stark@advantest.com) - mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) - New lorax documentation 40.8 (bcl@redhat.com) - docs: Remove links to older branches (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6e221c..2ab8876 100644 --- a/.gitignore +++ b/.gitignore @@ -243,3 +243,4 @@ /lorax-40.5.tar.gz /lorax-40.6.tar.gz /lorax-40.7.tar.gz +/lorax-40.8.tar.gz diff --git a/lorax.spec b/lorax.spec index 71322dd..3ee96ab 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.7 +Version: 40.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -171,6 +171,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 08 2024 Brian C. Lane 40.8-1 +- creator: Fix pylint error in run_creator (bcl@redhat.com) +- tests: Fix mkksiso unit test (bcl@redhat.com) +- test: Use fedora:40 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) +- Implement --replace also for S390 (sebastian.stark@advantest.com) +- mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) +- New lorax documentation 40.8 (bcl@redhat.com) +- docs: Remove links to older branches (bcl@redhat.com) + * Tue Mar 26 2024 Brian C. Lane 40.7-1 - runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) diff --git a/sources b/sources index 0493260..5623401 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.7.tar.gz) = e6cc816d35f3ed04065e50386c43f25150ecada5146102dddbcb4bad448f10d45e9df9e96a3a11c8dc0d9cc4333e6117410d247794fe4d36b86e34c5c3b76e60 +SHA512 (lorax-40.8.tar.gz) = f40bff1b4149bd9698b835c3c86298e737a28b4f4f1467f7120d77133878f6c3fbe8da77b90e38f576e525146784b40299d0c680bfe7064553de164b33a7e9c4 From bb1089bb3c353ebb1ef6fbe6e75b3d5c1f66b1ad Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 22 Nov 2024 11:06:18 -0800 Subject: [PATCH 4/5] - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - Prepare for the sbin merge (zbyszek@in.waw.pl) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2ab8876..7ae19bb 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /lorax-40.6.tar.gz /lorax-40.7.tar.gz /lorax-40.8.tar.gz +/lorax-40.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 3ee96ab..2e6d40e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.8 +Version: 40.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Nov 22 2024 Brian C. Lane 40.9-1 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) +- Prepare for the sbin merge (zbyszek@in.waw.pl) + * Tue Oct 08 2024 Brian C. Lane 40.8-1 - creator: Fix pylint error in run_creator (bcl@redhat.com) - tests: Fix mkksiso unit test (bcl@redhat.com) diff --git a/sources b/sources index 5623401..6980e72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.8.tar.gz) = f40bff1b4149bd9698b835c3c86298e737a28b4f4f1467f7120d77133878f6c3fbe8da77b90e38f576e525146784b40299d0c680bfe7064553de164b33a7e9c4 +SHA512 (lorax-40.9.tar.gz) = 5c4033f3eebd5810a142d631b1a86a81f070e488c1a2c063528d116765f296477f8902803083b97c52509e26c1d31369f5674cecdc674236a742a6e769cc5ec1 From ffb20e0869006382aa14caf93426b2571a91ae6f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Nov 2024 10:29:09 -0800 Subject: [PATCH 5/5] tests: Set release to 40 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 2e6d40e..a270767 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.9 -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 - 40.9-2 +- tests: Set release to 40 instead of rawhide (bcl) + * Fri Nov 22 2024 Brian C. Lane 40.9-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - Prepare for the sbin merge (zbyszek@in.waw.pl) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index f4849b2..f26c626 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=40 --release=40 --volid="Fedora-40-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi