From 9eed18b5672b3d32213a064af06f913a4b912dde Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 11 Oct 2021 15:46:54 -0700 Subject: [PATCH 001/111] - New lorax documentation - 36.0 (bcl@redhat.com) - docs: Remove logging command from examples (bcl@redhat.com) - runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) - runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) - runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) - Fix pylint warnings about string formatting (bcl@redhat.com) - tests: Ignore new pylint warnings (bcl@redhat.com) - Add fstrim to disk and filesystem image creation (bcl@redhat.com) --- .gitignore | 1 + ...drop-some-Qualcomm-smartphone-firmwa.patch | 29 ------------- ...drop-Marvell-Prestera-firmware-files.patch | 28 ------------- ...exclude-liquidio-and-netronome-firmw.patch | 41 ------------------- lorax.spec | 24 +++++------ sources | 2 +- 6 files changed, 14 insertions(+), 111 deletions(-) delete mode 100644 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch delete mode 100644 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch delete mode 100644 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch diff --git a/.gitignore b/.gitignore index 0303f4d..8780d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -203,3 +203,4 @@ /lorax-35.5.tar.gz /lorax-35.6.tar.gz /lorax-35.7.tar.gz +/lorax-36.0.tar.gz diff --git a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch b/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch deleted file mode 100644 index 43052d6..0000000 --- a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a70fcd5ea015580f83e9470fa65d7e5a657243f4 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:19:47 -0700 -Subject: [PATCH 1/3] runtime-cleanup: drop some Qualcomm smartphone firmwares - -These firmwares are for Qualcomm smartphone chipsets (SM845 and -SM8250). Don't think they're any use in network install images. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 37c45338..5960c82b 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -231,6 +231,8 @@ removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin - removefrom linux-firmware /usr/lib/firmware/intel/fw_sst* - removefrom linux-firmware /usr/lib/firmware/intel/dsp* - removefrom linux-firmware /usr/lib/firmware/as102* -+removefrom linux-firmware /usr/lib/firmware/qcom/sdm845/* -+removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* --- -2.32.0 - diff --git a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch b/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch deleted file mode 100644 index e0e27bf..0000000 --- a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f4a66bf53acc4beae9530361de96fdbb81b44f9 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:21:34 -0700 -Subject: [PATCH 2/3] runtime-cleanup: drop Marvell Prestera firmware files - -These add up to 26MB and they are for high-end switches, unlikely -targets for network installs. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 5960c82b..827465f0 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -236,6 +236,7 @@ removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* -+removefrom linux-firmware /usr/lib/firmware/mrvl/prestera/* - %if basearch != "aarch64": - removefrom linux-firmware /usr/lib/firmware/dpaa2/* - %endif --- -2.32.0 - diff --git a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch b/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch deleted file mode 100644 index 327cbd2..0000000 --- a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8514ce1ceb9b31cc5b0ab7d00951b70e9c237609 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:43:21 -0700 -Subject: [PATCH 3/3] runtime-install: exclude liquidio and netronome firmwares - -As Peter Robinson explains here: -https://bugzilla.redhat.com/show_bug.cgi?id=2011615#c3 -these are not useful, as the devices they're for do not support -netinst-style deployment. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 4aabe292..fddac051 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -17,12 +17,16 @@ installpkg grubby - %if basearch != "s390x": - ## skip the firmware for sound, video, and scanners, none of which will - ## do much good for the installer. Also skip uhd-firmware which is not -- ## even a kernel firmware package. -+ ## even a kernel firmware package. liquidio and netronome firmwares are -+ ## for enterprise switch devices, netinst deployment does not work on -+ ## these so there is no point shipping them - see -+ ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ - --except uhd-firmware --except lulzbot-marlin-firmware \ -- --except gnome-firmware --except sigrok-firmware -+ --except gnome-firmware --except sigrok-firmware \ -+ --except liquidio-firmware --except netronome-firmware - installpkg b43-openfwwf - %endif - --- -2.32.0 - diff --git a/lorax.spec b/lorax.spec index 60c4f10..58c3fcb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.7 -Release: 2%{?dist} +Version: 36.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,13 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Trim some unneeded firmware files to reduce size of netinsts -# https://bugzilla.redhat.com/show_bug.cgi?id=2009730 -# https://bugzilla.redhat.com/show_bug.cgi?id=2009731 -# https://github.com/weldr/lorax/pull/1175 -Patch0: 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch -Patch1: 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch -Patch2: 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch BuildRequires: python3-devel BuildRequires: make @@ -141,7 +134,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} %build @@ -182,8 +175,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Oct 08 2021 Adam Williamson - 35.7-2 -- Backport PR #1175 to reduce size of netinsts (#2009730, #2009731) +* Mon Oct 11 2021 Brian C. Lane 36.0-1 +- New lorax documentation - 36.0 (bcl@redhat.com) +- docs: Remove logging command from examples (bcl@redhat.com) +- runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) +- runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) +- runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) +- Fix pylint warnings about string formatting (bcl@redhat.com) +- tests: Ignore new pylint warnings (bcl@redhat.com) +- Add fstrim to disk and filesystem image creation (bcl@redhat.com) * Tue Sep 07 2021 Brian C. Lane 35.7-1 - templates: Remove memtest86+ (bcl@redhat.com) diff --git a/sources b/sources index b9bc57f..a31122f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.7.tar.gz) = 21ee1fb8bf2228aa802ae13244955a7b1c14f655ed5d9ef40caee0f3ae9085c2b327e611518a60c57e4ea9ee85f1579242804dfc49a5e53cf60fa586dee38530 +SHA512 (lorax-36.0.tar.gz) = a43a68523769adeb029ab874ae95aa23ae066801b92e9b4e2c3fbecb76fbe48b56b1c643cd3db3089f766e20b540f0d8818bcb959770376f495a3693f7a42a36 From fe817d06d864c518f1ce97cb26721163388b63aa Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 28 Oct 2021 14:31:25 -0700 Subject: [PATCH 002/111] - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8780d0c..79efb37 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ /lorax-35.6.tar.gz /lorax-35.7.tar.gz /lorax-36.0.tar.gz +/lorax-36.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 58c3fcb..ad4d1e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.0 +Version: 36.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Oct 28 2021 Brian C. Lane 36.1-1 +- dnfbase: Handle defaults better (bcl@redhat.com) +- ltmpl: Add version compare support to installpkg (bcl@redhat.com) + * Mon Oct 11 2021 Brian C. Lane 36.0-1 - New lorax documentation - 36.0 (bcl@redhat.com) - docs: Remove logging command from examples (bcl@redhat.com) diff --git a/sources b/sources index a31122f..e18de65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.0.tar.gz) = a43a68523769adeb029ab874ae95aa23ae066801b92e9b4e2c3fbecb76fbe48b56b1c643cd3db3089f766e20b540f0d8818bcb959770376f495a3693f7a42a36 +SHA512 (lorax-36.1.tar.gz) = 4ccb514ac867ff1d52d3458c5a21561ddafe79a9b5c7d536911e500114ec4ee363798d8e720a11e45ff78d1b640797bf7b723ffc3251e4def93c1fce5f9b970f From a3bb519e918490aa1aa2b9473f73bebdd5285894 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 10 Nov 2021 15:46:29 -0800 Subject: [PATCH 003/111] - Remove memtest86+ from example kickstarts (bcl@redhat.com) - fedora-livemedia: Update example kickstart (bcl@redhat.com) - mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) - Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) - runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) - runtime-install: Fix grub2 epoch, it is 1 not 0 (bcl@redhat.com) - Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79efb37..5e9746f 100644 --- a/.gitignore +++ b/.gitignore @@ -205,3 +205,4 @@ /lorax-35.7.tar.gz /lorax-36.0.tar.gz /lorax-36.1.tar.gz +/lorax-36.2.tar.gz diff --git a/lorax.spec b/lorax.spec index ad4d1e9..3826300 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.1 +Version: 36.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -51,7 +51,7 @@ Requires: python3-mako Requires: python3-kickstart >= 3.19 Requires: python3-dnf >= 3.2.0 Requires: python3-librepo -Requires: python3-pycdlib +Requires: python3-pycdio %if 0%{?fedora} # Fedora specific deps @@ -175,6 +175,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Nov 10 2021 Brian C. Lane 36.2-1 +- Remove memtest86+ from example kickstarts (bcl@redhat.com) +- fedora-livemedia: Update example kickstart (bcl@redhat.com) +- mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) +- Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) +- runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) +- runtime-install: Fix grub2 epoch, it is 1 not 0 (bcl@redhat.com) +- Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) + * Thu Oct 28 2021 Brian C. Lane 36.1-1 - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) diff --git a/sources b/sources index e18de65..206f94c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.1.tar.gz) = 4ccb514ac867ff1d52d3458c5a21561ddafe79a9b5c7d536911e500114ec4ee363798d8e720a11e45ff78d1b640797bf7b723ffc3251e4def93c1fce5f9b970f +SHA512 (lorax-36.2.tar.gz) = 8f71f8001513c3da834bbfbc3bd71865754b175b3565d4dd1fb286fb5dbad1d0d6fb0590fe79f46fa3e257288f772d68c772947f0a92302eb36c6a151568b1c2 From 828b0b0c5b365ce15ef3cef68df75df974b3b900 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 10 Nov 2021 16:15:10 -0800 Subject: [PATCH 004/111] - mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) - fedora-livemedia: Turn off GNOME welcome tour (bcl@redhat.com) - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) - fedora-livemedia: Add anaconda-install-img-deps (bcl@redhat.com) - Use fedora:35 for Dockerfile.test (bcl@redhat.com) - Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) - runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) - Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) - New lorax documentation - 35.7 (bcl@redhat.com) - Fix pylint warnings about string formatting (bcl@redhat.com) - tests: Ignore new pylint warnings (bcl@redhat.com) - runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) - runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) - runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) --- .gitignore | 1 + ...drop-some-Qualcomm-smartphone-firmwa.patch | 29 ------------- ...drop-Marvell-Prestera-firmware-files.patch | 28 ------------- ...exclude-liquidio-and-netronome-firmw.patch | 41 ------------------- lorax.spec | 33 +++++++++------ sources | 2 +- 6 files changed, 22 insertions(+), 112 deletions(-) delete mode 100644 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch delete mode 100644 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch delete mode 100644 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch diff --git a/.gitignore b/.gitignore index 0303f4d..3573e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -203,3 +203,4 @@ /lorax-35.5.tar.gz /lorax-35.6.tar.gz /lorax-35.7.tar.gz +/lorax-35.8.tar.gz diff --git a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch b/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch deleted file mode 100644 index 43052d6..0000000 --- a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a70fcd5ea015580f83e9470fa65d7e5a657243f4 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:19:47 -0700 -Subject: [PATCH 1/3] runtime-cleanup: drop some Qualcomm smartphone firmwares - -These firmwares are for Qualcomm smartphone chipsets (SM845 and -SM8250). Don't think they're any use in network install images. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 37c45338..5960c82b 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -231,6 +231,8 @@ removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin - removefrom linux-firmware /usr/lib/firmware/intel/fw_sst* - removefrom linux-firmware /usr/lib/firmware/intel/dsp* - removefrom linux-firmware /usr/lib/firmware/as102* -+removefrom linux-firmware /usr/lib/firmware/qcom/sdm845/* -+removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* --- -2.32.0 - diff --git a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch b/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch deleted file mode 100644 index e0e27bf..0000000 --- a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f4a66bf53acc4beae9530361de96fdbb81b44f9 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:21:34 -0700 -Subject: [PATCH 2/3] runtime-cleanup: drop Marvell Prestera firmware files - -These add up to 26MB and they are for high-end switches, unlikely -targets for network installs. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 5960c82b..827465f0 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -236,6 +236,7 @@ removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* -+removefrom linux-firmware /usr/lib/firmware/mrvl/prestera/* - %if basearch != "aarch64": - removefrom linux-firmware /usr/lib/firmware/dpaa2/* - %endif --- -2.32.0 - diff --git a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch b/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch deleted file mode 100644 index 327cbd2..0000000 --- a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8514ce1ceb9b31cc5b0ab7d00951b70e9c237609 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:43:21 -0700 -Subject: [PATCH 3/3] runtime-install: exclude liquidio and netronome firmwares - -As Peter Robinson explains here: -https://bugzilla.redhat.com/show_bug.cgi?id=2011615#c3 -these are not useful, as the devices they're for do not support -netinst-style deployment. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 4aabe292..fddac051 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -17,12 +17,16 @@ installpkg grubby - %if basearch != "s390x": - ## skip the firmware for sound, video, and scanners, none of which will - ## do much good for the installer. Also skip uhd-firmware which is not -- ## even a kernel firmware package. -+ ## even a kernel firmware package. liquidio and netronome firmwares are -+ ## for enterprise switch devices, netinst deployment does not work on -+ ## these so there is no point shipping them - see -+ ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ - --except uhd-firmware --except lulzbot-marlin-firmware \ -- --except gnome-firmware --except sigrok-firmware -+ --except gnome-firmware --except sigrok-firmware \ -+ --except liquidio-firmware --except netronome-firmware - installpkg b43-openfwwf - %endif - --- -2.32.0 - diff --git a/lorax.spec b/lorax.spec index 60c4f10..03d636c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.7 -Release: 2%{?dist} +Version: 35.8 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,13 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Trim some unneeded firmware files to reduce size of netinsts -# https://bugzilla.redhat.com/show_bug.cgi?id=2009730 -# https://bugzilla.redhat.com/show_bug.cgi?id=2009731 -# https://github.com/weldr/lorax/pull/1175 -Patch0: 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch -Patch1: 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch -Patch2: 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch BuildRequires: python3-devel BuildRequires: make @@ -58,7 +51,7 @@ Requires: python3-mako Requires: python3-kickstart >= 3.19 Requires: python3-dnf >= 3.2.0 Requires: python3-librepo -Requires: python3-pycdlib +Requires: python3-pycdio %if 0%{?fedora} # Fedora specific deps @@ -141,7 +134,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} %build @@ -182,8 +175,22 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Oct 08 2021 Adam Williamson - 35.7-2 -- Backport PR #1175 to reduce size of netinsts (#2009730, #2009731) +* Wed Nov 10 2021 Brian C. Lane 35.8-1 +- mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) +- fedora-livemedia: Turn off GNOME welcome tour (bcl@redhat.com) +- dnfbase: Handle defaults better (bcl@redhat.com) +- ltmpl: Add version compare support to installpkg (bcl@redhat.com) +- fedora-livemedia: Add anaconda-install-img-deps (bcl@redhat.com) +- Use fedora:35 for Dockerfile.test (bcl@redhat.com) +- Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) +- runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) +- Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) +- New lorax documentation - 35.7 (bcl@redhat.com) +- Fix pylint warnings about string formatting (bcl@redhat.com) +- tests: Ignore new pylint warnings (bcl@redhat.com) +- runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) +- runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) +- runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) * Tue Sep 07 2021 Brian C. Lane 35.7-1 - templates: Remove memtest86+ (bcl@redhat.com) diff --git a/sources b/sources index b9bc57f..618229f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.7.tar.gz) = 21ee1fb8bf2228aa802ae13244955a7b1c14f655ed5d9ef40caee0f3ae9085c2b327e611518a60c57e4ea9ee85f1579242804dfc49a5e53cf60fa586dee38530 +SHA512 (lorax-35.8.tar.gz) = 137fb382d652259f009d34f2d140a38b20415e6fcae0820aa6c7e45e7f9816bafc16745f7ed127dc59e6177823a43635fff0b23e1b9e5a92fa560934fae8ddea From 32ec53c728f77cf2fd1a68acb4c37abdea6c1a24 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 11 Nov 2021 10:18:50 -0800 Subject: [PATCH 005/111] gating: Use lazy unmount --- tests/scripts/run_tests.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 4894eb5..8cd29e9 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -30,6 +30,12 @@ function running { echo -e "\n\n#### RUN: $1\n" } +# unmount the dirs lazily because sometimes some outside thing is still touching them +function umount_dirs { + umount --lazy "$IMGDIR" + umount --lazy "$ISODIR" +} + [ -e "$ISODIR" ] || mkdir "$ISODIR" [ -e "$IMGDIR" ] || mkdir "$IMGDIR" @@ -43,8 +49,7 @@ function ks_only { test_ks status "Add kickstart" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks { @@ -71,8 +76,7 @@ function ks_serial { test_ks_serial status "Add kickstart and serial cmdline" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks_serial { @@ -95,8 +99,7 @@ function new_volid { test_volid status "Use a new VOLID" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_volid { @@ -118,8 +121,7 @@ function add_files { test_files status "Add files" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_files { @@ -139,8 +141,7 @@ function run_all { test_files status "Use all the options" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } From cebf7105901e77f04ab9ee565b75300e48a013e6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 11 Nov 2021 10:18:50 -0800 Subject: [PATCH 006/111] gating: Use lazy unmount --- tests/scripts/run_tests.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 4894eb5..8cd29e9 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -30,6 +30,12 @@ function running { echo -e "\n\n#### RUN: $1\n" } +# unmount the dirs lazily because sometimes some outside thing is still touching them +function umount_dirs { + umount --lazy "$IMGDIR" + umount --lazy "$ISODIR" +} + [ -e "$ISODIR" ] || mkdir "$ISODIR" [ -e "$IMGDIR" ] || mkdir "$IMGDIR" @@ -43,8 +49,7 @@ function ks_only { test_ks status "Add kickstart" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks { @@ -71,8 +76,7 @@ function ks_serial { test_ks_serial status "Add kickstart and serial cmdline" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks_serial { @@ -95,8 +99,7 @@ function new_volid { test_volid status "Use a new VOLID" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_volid { @@ -118,8 +121,7 @@ function add_files { test_files status "Add files" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_files { @@ -139,8 +141,7 @@ function run_all { test_files status "Use all the options" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } From e09af460262c20817023e72ca542402440fb32fe Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 9 Dec 2021 09:59:21 -0800 Subject: [PATCH 007/111] - mkksiso: Check the length of the filenames (bcl@redhat.com) - mkksiso: Check the iso's arch against the host's (bcl@redhat.com) - mkksiso: Add missing implantisomd5 tool requirements (bcl@redhat.com) - mkksiso: Raise error if no volume id is found (bcl@redhat.com) - mount: Add s390x support to IsoMountopoint (bcl@redhat.com) - mkksiso: Skip mkefiboot for non-UEFI isos (bcl@redhat.com) - mkksiso: Add -joliet-long (bcl@redhat.com) - mkksiso: Return 1 on errors (bcl@redhat.com) - Fix monitor problem with split UTF8 characters (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e9746f..fd16523 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,4 @@ /lorax-36.0.tar.gz /lorax-36.1.tar.gz /lorax-36.2.tar.gz +/lorax-36.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 3826300..7fe8694 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.2 +Version: 36.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Dec 09 2021 Brian C. Lane 36.3-1 +- mkksiso: Check the length of the filenames (bcl@redhat.com) +- mkksiso: Check the iso's arch against the host's (bcl@redhat.com) +- mkksiso: Add missing implantisomd5 tool requirements (bcl@redhat.com) +- mkksiso: Raise error if no volume id is found (bcl@redhat.com) +- mount: Add s390x support to IsoMountopoint (bcl@redhat.com) +- mkksiso: Skip mkefiboot for non-UEFI isos (bcl@redhat.com) +- mkksiso: Add -joliet-long (bcl@redhat.com) +- mkksiso: Return 1 on errors (bcl@redhat.com) +- Fix monitor problem with split UTF8 characters (bcl@redhat.com) + * Wed Nov 10 2021 Brian C. Lane 36.2-1 - Remove memtest86+ from example kickstarts (bcl@redhat.com) - fedora-livemedia: Update example kickstart (bcl@redhat.com) diff --git a/sources b/sources index 206f94c..d584e42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.2.tar.gz) = 8f71f8001513c3da834bbfbc3bd71865754b175b3565d4dd1fb286fb5dbad1d0d6fb0590fe79f46fa3e257288f772d68c772947f0a92302eb36c6a151568b1c2 +SHA512 (lorax-36.3.tar.gz) = aab93d4fbc2b1df201af1c1e2a6ea390805c3830c682cbe9c3b95603fc8686baddcdf9a3e23e42dbec690ea07b5832f84ebf8648b63432dfe74ae8c6803358c5 From 02601e51fa4ae0741700d87ec923368d40707953 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Dec 2021 13:39:56 -0800 Subject: [PATCH 008/111] - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) - New lorax documentation - 36.3 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd16523..36e2d46 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ /lorax-36.1.tar.gz /lorax-36.2.tar.gz /lorax-36.3.tar.gz +/lorax-36.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 7fe8694..66e8790 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.3 +Version: 36.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 14 2021 Brian C. Lane 36.4-1 +- cleanup: remove binaries from lilv (awilliam@redhat.com) +- runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) +- New lorax documentation - 36.3 (bcl@redhat.com) + * Thu Dec 09 2021 Brian C. Lane 36.3-1 - mkksiso: Check the length of the filenames (bcl@redhat.com) - mkksiso: Check the iso's arch against the host's (bcl@redhat.com) diff --git a/sources b/sources index d584e42..88660d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.3.tar.gz) = aab93d4fbc2b1df201af1c1e2a6ea390805c3830c682cbe9c3b95603fc8686baddcdf9a3e23e42dbec690ea07b5832f84ebf8648b63432dfe74ae8c6803358c5 +SHA512 (lorax-36.4.tar.gz) = a0ca273d82498b2f568524b1d563f1a54b4211c8081e47068376b9e1bfe08520ea4aa299461a602c13aea14f88b2b923676cfdfec23f32b8d3f49f56530c0828 From 8a6043dbac132b299f2e85aa94bb0447605c737b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Dec 2021 13:53:20 -0800 Subject: [PATCH 009/111] - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3573e7d..ebfa7f9 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ /lorax-35.6.tar.gz /lorax-35.7.tar.gz /lorax-35.8.tar.gz +/lorax-35.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 03d636c..b2b37b2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 35.8 +Version: 35.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 14 2021 Brian C. Lane 35.9-1 +- cleanup: remove binaries from lilv (awilliam@redhat.com) +- runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) + * Wed Nov 10 2021 Brian C. Lane 35.8-1 - mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) - fedora-livemedia: Turn off GNOME welcome tour (bcl@redhat.com) diff --git a/sources b/sources index 618229f..df23705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.8.tar.gz) = 137fb382d652259f009d34f2d140a38b20415e6fcae0820aa6c7e45e7f9816bafc16745f7ed127dc59e6177823a43635fff0b23e1b9e5a92fa560934fae8ddea +SHA512 (lorax-35.9.tar.gz) = 70170551f207a66965cbaa8855b2759b18912e89f384e9dadb7f5e72ab93130f28c98ee4422828497db1b28edc463f7d6e0e73e2386dbb6e71673c5c2fdf6e52 From 94d225feb6a67ec8ea831c4276dd9f7f007b9f25 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 6 Jan 2022 10:09:06 -0800 Subject: [PATCH 010/111] Rebuild with no changes for Bodhi purposes --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index b2b37b2..0b25e6d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 06 2022 Adam Williamson - 35.9-2 +- Rebuild with no changes for Bodhi purposes + * Tue Dec 14 2021 Brian C. Lane 35.9-1 - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) From c4f3b640ee5589ca2afa2e41fd36a7c230c6687d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:05:52 +0000 Subject: [PATCH 011/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 66e8790..4aee482 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 36.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 36.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Brian C. Lane 36.4-1 - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) From 5bf63051fc283be38b36966a3d540b80816628a4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Feb 2022 14:12:38 -0800 Subject: [PATCH 012/111] Switch to using tmt testing instead of STI --- {tests/.fmf => .fmf}/version | 0 plans/build-iso.fmf | 7 +++++++ tests/provision.fmf | 5 ----- tests/tests.yml | 15 --------------- 4 files changed, 7 insertions(+), 20 deletions(-) rename {tests/.fmf => .fmf}/version (100%) create mode 100644 plans/build-iso.fmf delete mode 100644 tests/provision.fmf delete mode 100644 tests/tests.yml diff --git a/tests/.fmf/version b/.fmf/version similarity index 100% rename from tests/.fmf/version rename to .fmf/version diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf new file mode 100644 index 0000000..ae03eff --- /dev/null +++ b/plans/build-iso.fmf @@ -0,0 +1,7 @@ +summary: Run Lorax tests (build an iso, run mkksiso on it) +prepare: + how: install + package: + - lorax +execute: + script: ./tests/scripts/run_tests.sh diff --git a/tests/provision.fmf b/tests/provision.fmf deleted file mode 100644 index dd69f34..0000000 --- a/tests/provision.fmf +++ /dev/null @@ -1,5 +0,0 @@ ---- - -standard-inventory-qcow2: - qemu: - m: 4G diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d39d256..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Run lorax with the new templates -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - required_packages: - - lorax - - tests: - - simple: - dir: scripts - run: ./run_tests.sh From 64b74a534384a89ecff85f079a8c4efe5482b338 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Feb 2022 16:11:20 -0800 Subject: [PATCH 013/111] - switch to tmt testing instead of STI - drop unused patch incorporated upstream last year - mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) - mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) - mkksiso: mkfsiso argument order matters (bcl@redhat.com) - mkksiso: Add kickstart to s390x cdboot.prm (bcl@redhat.com) - cleanup: handle RPM database move to /usr (awilliam@redhat.com) - Install the variable font of the Cantarell font (akira@tagoh.org) - Update the template for f36 Change proposal: https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts (akira@tagoh.org) - Update Malayalam font to its new renamed package name rit-meera-new-fonts (pnemade@fedoraproject.org) - Enable sftp when using inst.sshd (bcl@redhat.com) - Add inst.rngd cmdline option (bcl@redhat.com) - docs: Update docs for image-minimizer (bcl@redhat.com) - tests: Add tests for image-minimizer (bcl@redhat.com) - image-minimizer: Check for missing root directory (bcl@redhat.com) - image-minimizer: Fix utf8 error and add docs (bcl@redhat.com) --- .gitignore | 1 + icfg-retire.patch | 25 ------------------------- lorax.spec | 23 +++++++++++++++++++---- sources | 2 +- 4 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 icfg-retire.patch diff --git a/.gitignore b/.gitignore index 36e2d46..afb1822 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ /lorax-36.2.tar.gz /lorax-36.3.tar.gz /lorax-36.4.tar.gz +/lorax-36.5.tar.gz diff --git a/icfg-retire.patch b/icfg-retire.patch deleted file mode 100644 index dddff62..0000000 --- a/icfg-retire.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 568462d98313ef6796304d760a620e535f110d77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 9 Jun 2021 09:17:59 +0200 -Subject: [PATCH] Drop retired icfg - -Rawhide compose failed because icfg was retired yesterday: -https://src.fedoraproject.org/rpms/icfg/c/64ef393a109dd468b1b6950bfef70b2c45b5b903?branch=rawhide -https://pagure.io/releng/failed-composes/issue/2557 ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 83ec12835..1aaac0907 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -173,7 +173,7 @@ installpkg python3-pyatspi - installpkg nano nano-default-editor - installpkg vim-minimal strace lsof dump xz less - installpkg wget rsync bind-utils ftp mtr vconfig --installpkg icfg spice-vdagent -+installpkg spice-vdagent - installpkg gdisk hexedit sg3_utils - - ## actually install all the requested packages diff --git a/lorax.spec b/lorax.spec index 4aee482..569626b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 36.4 -Release: 2%{?dist} +Version: 36.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -161,6 +161,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/lorax.1* %{_mandir}/man1/livemedia-creator.1* %{_mandir}/man1/mkksiso.1* +%{_mandir}/man1/image-minimizer.1* %{_tmpfilesdir}/lorax.conf %files docs @@ -175,8 +176,22 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 36.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Thu Feb 03 2022 Brian C. Lane 36.5-1 +- mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) +- mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) +- mkksiso: mkfsiso argument order matters (bcl@redhat.com) +- mkksiso: Add kickstart to s390x cdboot.prm (bcl@redhat.com) +- cleanup: handle RPM database move to /usr (awilliam@redhat.com) +- Install the variable font of the Cantarell font (akira@tagoh.org) +- Update the template for f36 Change proposal: + https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts (akira@tagoh.org) +- Update Malayalam font to its new renamed package name rit-meera-new-fonts (pnemade@fedoraproject.org) +- Enable sftp when using inst.sshd (bcl@redhat.com) +- Add inst.rngd cmdline option (bcl@redhat.com) +- docs: Update docs for image-minimizer (bcl@redhat.com) +- tests: Add tests for image-minimizer (bcl@redhat.com) +- image-minimizer: Check for missing root directory (bcl@redhat.com) +- image-minimizer: Fix utf8 error and add docs (bcl@redhat.com) * Tue Dec 14 2021 Brian C. Lane 36.4-1 - cleanup: remove binaries from lilv (awilliam@redhat.com) diff --git a/sources b/sources index 88660d7..fbeace6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.4.tar.gz) = a0ca273d82498b2f568524b1d563f1a54b4211c8081e47068376b9e1bfe08520ea4aa299461a602c13aea14f88b2b923676cfdfec23f32b8d3f49f56530c0828 +SHA512 (lorax-36.5.tar.gz) = faefa1ff167e7b947b543d22735b93ab9167aa0ff0223108855c855405cee4219e6e3c5fa7b914081ac69d905e29554531485f559876fa3795573e5b3c6473e1 From 485bb63b9bbc19bea7a91ae3aaeff74ba78ff63e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 4 Feb 2022 08:44:41 -0800 Subject: [PATCH 014/111] - mkksiso: Fix check for unsupported arch error (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index afb1822..4813766 100644 --- a/.gitignore +++ b/.gitignore @@ -209,3 +209,4 @@ /lorax-36.3.tar.gz /lorax-36.4.tar.gz /lorax-36.5.tar.gz +/lorax-36.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 569626b..04ffb45 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.5 +Version: 36.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Feb 04 2022 Brian C. Lane 36.6-1 +- mkksiso: Fix check for unsupported arch error (bcl@redhat.com) + * Thu Feb 03 2022 Brian C. Lane 36.5-1 - mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) - mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) diff --git a/sources b/sources index fbeace6..e98fcbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.5.tar.gz) = faefa1ff167e7b947b543d22735b93ab9167aa0ff0223108855c855405cee4219e6e3c5fa7b914081ac69d905e29554531485f559876fa3795573e5b3c6473e1 +SHA512 (lorax-36.6.tar.gz) = 5d0b9f88ff0870579ce94e4e7f670a0d02c76a63d132dcb0a937c72a83f2bc09e826dd02ce2ce097f37e0fa2160a54c5516e851748d907f32aa2b57756ffcb50 From dd1cf78be58fe258972604cf323ce0a3cb96a197 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 14 Feb 2022 14:58:41 -0800 Subject: [PATCH 015/111] - postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) - tests: Fix the image minimizer test dnf usage (bcl@redhat.com) - runtime-cleanup: drop kernel drivers/iio (awilliam@redhat.com) - runtime-cleanup: drop gallium-pipe drivers from mesa-dri-drivers (awilliam@redhat.com) - runtime-cleanup: drop yelp's local MathJax library copy (awilliam@redhat.com) - runtime-cleanup: drop eapol_test from wpa_supplicant (awilliam@redhat.com) - runtime-cleanup: drop /usr/bin/cyrusbdb2current (awilliam@redhat.com) - runtime-cleanup: drop systemd-analyze (awilliam@redhat.com) - runtime-cleanup: drop mtools and glibc-gconv-extra (awilliam@redhat.com) - runtime-cleanup: drop guile22's ccache (awilliam@redhat.com) - runtime-cleanup: fix warnings from old or changed packages (awilliam@redhat.com) - runtime-cleanup: drop Italic from google-noto-sans-vf-fonts (awilliam@redhat.com) - runtime-install: drop some unnecessary font packages (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4813766..463974f 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,4 @@ /lorax-36.4.tar.gz /lorax-36.5.tar.gz /lorax-36.6.tar.gz +/lorax-36.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 04ffb45..ffeb925 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.6 +Version: 36.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,21 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Feb 14 2022 Brian C. Lane 36.7-1 +- postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) +- tests: Fix the image minimizer test dnf usage (bcl@redhat.com) +- runtime-cleanup: drop kernel drivers/iio (awilliam@redhat.com) +- runtime-cleanup: drop gallium-pipe drivers from mesa-dri-drivers (awilliam@redhat.com) +- runtime-cleanup: drop yelp's local MathJax library copy (awilliam@redhat.com) +- runtime-cleanup: drop eapol_test from wpa_supplicant (awilliam@redhat.com) +- runtime-cleanup: drop /usr/bin/cyrusbdb2current (awilliam@redhat.com) +- runtime-cleanup: drop systemd-analyze (awilliam@redhat.com) +- runtime-cleanup: drop mtools and glibc-gconv-extra (awilliam@redhat.com) +- runtime-cleanup: drop guile22's ccache (awilliam@redhat.com) +- runtime-cleanup: fix warnings from old or changed packages (awilliam@redhat.com) +- runtime-cleanup: drop Italic from google-noto-sans-vf-fonts (awilliam@redhat.com) +- runtime-install: drop some unnecessary font packages (awilliam@redhat.com) + * Fri Feb 04 2022 Brian C. Lane 36.6-1 - mkksiso: Fix check for unsupported arch error (bcl@redhat.com) diff --git a/sources b/sources index e98fcbe..90108f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.6.tar.gz) = 5d0b9f88ff0870579ce94e4e7f670a0d02c76a63d132dcb0a937c72a83f2bc09e826dd02ce2ce097f37e0fa2160a54c5516e851748d907f32aa2b57756ffcb50 +SHA512 (lorax-36.7.tar.gz) = 940935f9ea33050686561beb2e9aa3fd60769665f08c00534082314d9cfb9c653700146b14ae8bcbf407658948f58a0851485edfe8b3ba9f03143ab71fb4d655 From 0348f377e25169c87cd9d9df72877b44746e9a71 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 16 Feb 2022 12:01:51 -0800 Subject: [PATCH 016/111] - runtime-cleanup: Remove ncurses package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 463974f..9116702 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,4 @@ /lorax-36.5.tar.gz /lorax-36.6.tar.gz /lorax-36.7.tar.gz +/lorax-36.8.tar.gz diff --git a/lorax.spec b/lorax.spec index ffeb925..45b2e86 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.7 +Version: 36.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 16 2022 Brian C. Lane 36.8-1 +- runtime-cleanup: Remove ncurses package (bcl@redhat.com) + * Mon Feb 14 2022 Brian C. Lane 36.7-1 - postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) - tests: Fix the image minimizer test dnf usage (bcl@redhat.com) diff --git a/sources b/sources index 90108f7..143c114 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.7.tar.gz) = 940935f9ea33050686561beb2e9aa3fd60769665f08c00534082314d9cfb9c653700146b14ae8bcbf407658948f58a0851485edfe8b3ba9f03143ab71fb4d655 +SHA512 (lorax-36.8.tar.gz) = c1a800a9abd43c0bce47233faa7eb95bb8fe4ac226a325e61257f711bdcd2274d448d89a006c9cfaf67a3c67fdc67375923471740ed102f7954f7f1ffb89007c From 1bb7d2d70c6a84b10e13913cdd9d52640a19e3bd Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Feb 2022 14:36:44 -0800 Subject: [PATCH 017/111] - Don't move the restart-anaconda file (vponcova@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9116702..3387c37 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,4 @@ /lorax-36.6.tar.gz /lorax-36.7.tar.gz /lorax-36.8.tar.gz +/lorax-36.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 45b2e86..6f93390 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.8 +Version: 36.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Feb 28 2022 Brian C. Lane 36.9-1 +- Don't move the restart-anaconda file (vponcova@redhat.com) + * Wed Feb 16 2022 Brian C. Lane 36.8-1 - runtime-cleanup: Remove ncurses package (bcl@redhat.com) diff --git a/sources b/sources index 143c114..8036d08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.8.tar.gz) = c1a800a9abd43c0bce47233faa7eb95bb8fe4ac226a325e61257f711bdcd2274d448d89a006c9cfaf67a3c67fdc67375923471740ed102f7954f7f1ffb89007c +SHA512 (lorax-36.9.tar.gz) = 5bcfc55e984e96daf2d181ec746732280c9090bfb1095b9e797b2ae0a226520fdc2cfb88b0a22a788a70a7f178b18458ae292f751421dd73b8e073a95e66d58a From 683ca95f17969acf108666004f83629170cfb29c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Mar 2022 11:57:10 -0700 Subject: [PATCH 018/111] - New lorax documentation - 37.0 (bcl@redhat.com) - runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) --- .gitignore | 1 + lorax.spec | 70 ++++-------------------------------------------------- sources | 2 +- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 3387c37..f60e860 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,4 @@ /lorax-36.7.tar.gz /lorax-36.8.tar.gz /lorax-36.9.tar.gz +/lorax-37.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 6f93390..ab3c8f6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.9 +Version: 37.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 28 2022 Brian C. Lane 37.0-1 +- New lorax documentation - 37.0 (bcl@redhat.com) +- runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) + * Mon Feb 28 2022 Brian C. Lane 36.9-1 - Don't move the restart-anaconda file (vponcova@redhat.com) @@ -312,67 +316,3 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) - isolinux.cfg: Rename the 'vesa' menu entry to 'basic' (bcl@redhat.com) - composer-cli: Add support for start-ostree --url URL (bcl@redhat.com) - -* Mon Feb 15 2021 Brian C. Lane 34.9-1 -- Use inst.rescue to trigger rescue mode (awilliam@redhat.com) - Resolves: rhbz#1928318 -* Mon Feb 08 2021 Brian C. Lane 34.8-1 -- Use image dependencies metapackage (vslavik@redhat.com) -- tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com) - -* Wed Jan 20 2021 Brian C. Lane 34.7-1 -- live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) -- templates: Copy license files from the correct path (david.ward@ll.mit.edu) -- test: Fix vm.install for non-LVM cloud images (martin@piware.de) - -* Wed Dec 16 2020 Brian C. Lane 34.6-1 -- Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com) -- Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com) -- Improve lmc no-virt error handling (bcl@redhat.com) -- lorax.spec: Drop GConf2 requirement (bcl@redhat.com) - -* Mon Nov 30 2020 Brian C. Lane 34.5-1 -- Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) -- Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) -- Makefile: quiet rsync use in testing (bcl@redhat.com) -- Switch to using GitHub Actions instead of Travis CI (bcl@redhat.com) - -* Mon Nov 02 2020 Brian C. Lane 34.4-1 -- Update the default release version to 34 (bcl@redhat.com) -- Remove mdmonitor service from boot.iso (bcl@redhat.com) -- Switch to using upstream mk-s390image for s390 cdboot.img creation (bcl@redhat.com) -- sshd_config: Apply suggested changes (bcl@redhat.com) -- lorax.spec: Add BuildRequires on systemd-rpm-macros for tmpfilesdir macro (bcl@redhat.com) - -* Wed Oct 07 2020 Brian C. Lane 34.3-1 -- composer: Fix open file warnings (bcl@redhat.com) -- ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) -- tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com) -- Cleanup imgutil open files and processes (bcl@redhat.com) -- tests: Remove test_del_execReadlines (bcl@redhat.com) -- Fix unclosed files (bcl@redhat.com) -- test: Use Python dev mode during testing (bcl@redhat.com) -- tests: Update composer-cli blueprint server tests (bcl@redhat.com) -- runtime-cleanup: Delete .pyc files (bcl@redhat.com) -- New lorax documentation - 34.3 (bcl@redhat.com) -- doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com) -- docs: Update docs for lorax-composer removal (bcl@redhat.com) -- tests: Remove unused lorax-composer tests (bcl@redhat.com) -- Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com) - -* Tue Sep 29 2020 Brian C. Lane 34.2-1 -- runtime-cleanup: Remove ncurses package (bcl@redhat.com) - -* Mon Sep 14 2020 Brian C. Lane 34.1-1 -- Fix broken single-item tuples in a few places (awilliam@redhat.com) -- Drop dpaa2 firmware on non-aarch64 arches (awilliam@redhat.com) -- Drop firmware for Mellanox Spectrum (awilliam@redhat.com) -- runtime-cleanup: big refresh of stale things (awilliam@redhat.com) - -* Tue Sep 08 2020 Brian C. Lane 34.0-1 -- New lorax documentation - 34.0 (bcl@redhat.com) -- runtime-cleanup: strip a bunch of unnecessary firmwares (awilliam@redhat.com) -- runtime-install: specify polkit-gnome to avoid lxpolkit and GTK2 (awilliam@redhat.com) -- runtime-install: exclude gnome-firmware and sigrok-firmware (awilliam@redhat.com) -- runtime-cleanup: Drop video playback acceleration drivers (awilliam@redhat.com) -- runtime-install: don't install notification-daemon (awilliam@redhat.com) diff --git a/sources b/sources index 8036d08..369f7e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.9.tar.gz) = 5bcfc55e984e96daf2d181ec746732280c9090bfb1095b9e797b2ae0a226520fdc2cfb88b0a22a788a70a7f178b18458ae292f751421dd73b8e073a95e66d58a +SHA512 (lorax-37.0.tar.gz) = cc2ae4bb84c2fdfc056b2dc96b6e0948014c092b419821c9bf159fdd5b92fe908009614d42a54a1b5b9dfd3e9ab605df0861386735363b7e4bbd3598f78e8938 From 52072bb3c5cda600f6f6148acc59577a996feb40 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 11 May 2022 12:08:00 -0700 Subject: [PATCH 019/111] tests: Update run_tests.sh for new mkksiso --- tests/scripts/run_tests.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 8cd29e9..0cd66f5 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -7,7 +7,6 @@ KSNAME=fedora-minimal.ks KS="/usr/share/doc/lorax/$KSNAME" OUTISO=/var/tmp/out.iso ISODIR=/var/tmp/iso -IMGDIR=/var/tmp/img ## Functions for testing mkkiso @@ -32,12 +31,11 @@ function running { # unmount the dirs lazily because sometimes some outside thing is still touching them function umount_dirs { - umount --lazy "$IMGDIR" umount --lazy "$ISODIR" + rm -f "$OUTISO" } [ -e "$ISODIR" ] || mkdir "$ISODIR" -[ -e "$IMGDIR" ] || mkdir "$IMGDIR" # Only add kickstart function ks_only { @@ -61,8 +59,7 @@ function test_ks { grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" # Is the kickstart in the UEFI config? - mount "$ISODIR/images/efiboot.img" "$IMGDIR" || exit 1 - grep "inst.ks=.*$KSNAME" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" + grep "inst.ks=.*$KSNAME" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" } # Add ks and cmdline @@ -85,7 +82,7 @@ function test_ks_serial { grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry" # Is the serial in the UEFI config? - grep "console=ttyS0,115200n8" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" + grep "console=ttyS0,115200n8" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" } # New VOLID @@ -107,7 +104,7 @@ function test_volid { grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" # Is the VOLID in the UEFI config? - grep "hd:LABEL=mkksiso-test" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" + grep "hd:LABEL=mkksiso-test" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" } # Add extra files @@ -155,9 +152,11 @@ fi # NOTE: We must use --nomacboot because the test system doesn't have the hfsplus fs available # Run lorax using the host's repository configuration file -running "Build boot.iso with lorax" -lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ - $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 +if [ ! -e "$BOOTISO" ]; then + running "Build boot.iso with lorax" + lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 +fi # Test mkksiso on the new boot.iso ks_only From 1869e05bd2144620b9e86c3e8fcac27b72e5cb53 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 11 May 2022 12:11:59 -0700 Subject: [PATCH 020/111] - New lorax documentation - 37.1 (bcl@redhat.com) - docs: Update the mkksiso documentation (bcl@redhat.com) - setup.py: Install mkksiso to /usr/bin (bcl@redhat.com) - pylorax: Move variable out of try block (bcl@redhat.com) - setup.py: Use setup from setuptools not distutils (bcl@redhat.com) - Makefile: Remove -it options for test-in-podman (bcl@redhat.com) - mkksiso: Rewrite to use xorriso features (bcl@redhat.com) - docs: Fix typo in index.html (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f60e860..739638a 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ /lorax-36.8.tar.gz /lorax-36.9.tar.gz /lorax-37.0.tar.gz +/lorax-37.1.tar.gz diff --git a/lorax.spec b/lorax.spec index ab3c8f6..36d97ce 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.0 +Version: 37.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -16,6 +16,7 @@ URL: https://github.com/weldr/lorax Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -153,7 +154,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_sbindir}/lorax %{_sbindir}/mkefiboot %{_sbindir}/livemedia-creator -%{_sbindir}/mkksiso +%{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf @@ -176,6 +177,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 11 2022 Brian C. Lane 37.1-1 +- New lorax documentation - 37.1 (bcl@redhat.com) +- docs: Update the mkksiso documentation (bcl@redhat.com) +- setup.py: Install mkksiso to /usr/bin (bcl@redhat.com) +- pylorax: Move variable out of try block (bcl@redhat.com) +- setup.py: Use setup from setuptools not distutils (bcl@redhat.com) +- Makefile: Remove -it options for test-in-podman (bcl@redhat.com) +- mkksiso: Rewrite to use xorriso features (bcl@redhat.com) +- docs: Fix typo in index.html (bcl@redhat.com) + * Mon Mar 28 2022 Brian C. Lane 37.0-1 - New lorax documentation - 37.0 (bcl@redhat.com) - runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) diff --git a/sources b/sources index 369f7e0..e2edd0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.0.tar.gz) = cc2ae4bb84c2fdfc056b2dc96b6e0948014c092b419821c9bf159fdd5b92fe908009614d42a54a1b5b9dfd3e9ab605df0861386735363b7e4bbd3598f78e8938 +SHA512 (lorax-37.1.tar.gz) = f2fb20119e0b580a311b8d06d93d2f91e640dd66080674ed76b8d97611d2d51f47d100519486b13f70460bdc7968c7c6c8b0e5241ff48ab1bb8c2080bd23b9f7 From 7d701ad6539320ece725528f00200192dcb9d095 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 23 May 2022 11:24:31 -0700 Subject: [PATCH 021/111] - cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) - cleanup: strip more mellanox firmware files (awilliam@redhat.com) - cleanup: strip qcom/vpu* from linux-firmware (awilliam@redhat.com) - cleanup: drop qcom/apq8096 firmwares (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 739638a..462ef9a 100644 --- a/.gitignore +++ b/.gitignore @@ -215,3 +215,4 @@ /lorax-36.9.tar.gz /lorax-37.0.tar.gz /lorax-37.1.tar.gz +/lorax-37.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 36d97ce..9839332 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.1 +Version: 37.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon May 23 2022 Brian C. Lane 37.2-1 +- cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) +- cleanup: strip more mellanox firmware files (awilliam@redhat.com) +- cleanup: strip qcom/vpu* from linux-firmware (awilliam@redhat.com) +- cleanup: drop qcom/apq8096 firmwares (awilliam@redhat.com) + * Wed May 11 2022 Brian C. Lane 37.1-1 - New lorax documentation - 37.1 (bcl@redhat.com) - docs: Update the mkksiso documentation (bcl@redhat.com) diff --git a/sources b/sources index e2edd0f..413c05e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.1.tar.gz) = f2fb20119e0b580a311b8d06d93d2f91e640dd66080674ed76b8d97611d2d51f47d100519486b13f70460bdc7968c7c6c8b0e5241ff48ab1bb8c2080bd23b9f7 +SHA512 (lorax-37.2.tar.gz) = 18b6048bb7aedbcdd3ba60f920c632bb0f9fcd8e0ca0fdada24564f343531de611bf60eb1689435a198de88cc252b2263366e80e3f5f68faeffd6b7dc2d45d0e From fef70dbfd2060119de0ef370d272ff4d2da56363 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 11:48:11 -0700 Subject: [PATCH 022/111] - Add grub2 BIOS boot support to live iso template (bcl@redhat.com) Resolves: rhbz#2092065 - Drop grafting variables (bcl@redhat.com) - Drop macboot.img and simplify efiboot.img use (bcl@redhat.com) - Add grub2 BIOS boot support (bcl@redhat.com) - Remove syslinux support (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 462ef9a..da339d4 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,4 @@ /lorax-37.0.tar.gz /lorax-37.1.tar.gz /lorax-37.2.tar.gz +/lorax-37.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 9839332..e005764 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.2 +Version: 37.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 01 2022 Brian C. Lane 37.3-1 +- Add grub2 BIOS boot support to live iso template (bcl@redhat.com) + Resolves: rhbz#2092065 +- Drop grafting variables (bcl@redhat.com) +- Drop macboot.img and simplify efiboot.img use (bcl@redhat.com) +- Add grub2 BIOS boot support (bcl@redhat.com) +- Remove syslinux support (bcl@redhat.com) + * Mon May 23 2022 Brian C. Lane 37.2-1 - cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) - cleanup: strip more mellanox firmware files (awilliam@redhat.com) diff --git a/sources b/sources index 413c05e..f8b6db7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.2.tar.gz) = 18b6048bb7aedbcdd3ba60f920c632bb0f9fcd8e0ca0fdada24564f343531de611bf60eb1689435a198de88cc252b2263366e80e3f5f68faeffd6b7dc2d45d0e +SHA512 (lorax-37.3.tar.gz) = 22b4b4bfe7f2dc802907491230b91de35d29edec6d9307a176d88825a46cc2266f0646d93b2c4492f4753c5292a156df44d0855cf8f35d2fb378b590c9155f66 From dcb51c3647e385e4899de604f784ed1bc233b869 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 16:20:10 -0700 Subject: [PATCH 023/111] tests: Update tests for grub2 bios boot (cherry picked from commit ee85df30b44c98837e9f0ae2b5d4ee1e1c86f4a9) --- tests/scripts/run_tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 0cd66f5..5b62988 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -55,8 +55,8 @@ function test_ks { # Is there a kickstart in / of the iso? [ -e "$ISODIR/$KSNAME" ] || fail "Missing kickstart" - # Is the kickstart in the BIOS config? - grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + # Is the kickstart in the GRUB2 BIOS config? + grep "inst.ks=.*$KSNAME" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry" # Is the kickstart in the UEFI config? grep "inst.ks=.*$KSNAME" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" @@ -79,7 +79,7 @@ function ks_serial { function test_ks_serial { # Is the serial in the BIOS config? - grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry" + grep "console=ttyS0,115200n8" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg cmdline entry" # Is the serial in the UEFI config? grep "console=ttyS0,115200n8" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" @@ -101,7 +101,7 @@ function new_volid { function test_volid { # Is the VOLID in the BIOS config? - grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + grep "hd:LABEL=mkksiso-test" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry" # Is the VOLID in the UEFI config? grep "hd:LABEL=mkksiso-test" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" From 0d56ec6bff65bc243ff3c937fb3922dfa5e79b6a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 16:24:31 -0700 Subject: [PATCH 024/111] - mkksiso: Fix grub2 editing error (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index da339d4..ff872dc 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,4 @@ /lorax-37.1.tar.gz /lorax-37.2.tar.gz /lorax-37.3.tar.gz +/lorax-37.4.tar.gz diff --git a/lorax.spec b/lorax.spec index e005764..25577a9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.3 +Version: 37.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 01 2022 Brian C. Lane 37.4-1 +- mkksiso: Fix grub2 editing error (bcl@redhat.com) + * Wed Jun 01 2022 Brian C. Lane 37.3-1 - Add grub2 BIOS boot support to live iso template (bcl@redhat.com) Resolves: rhbz#2092065 diff --git a/sources b/sources index f8b6db7..9a2eccd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.3.tar.gz) = 22b4b4bfe7f2dc802907491230b91de35d29edec6d9307a176d88825a46cc2266f0646d93b2c4492f4753c5292a156df44d0855cf8f35d2fb378b590c9155f66 +SHA512 (lorax-37.4.tar.gz) = d0623bfb85f0c45d65442a7c3a8ca894de43fcd989a3d6530af46776800753a32cf8dc5cca9947f3fad50228fb4b3e4059d6d3487559be8007d6c8be079e224e From a1d5d0afdd2b9c93f0a9cfa69ff10f28966a687e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 3 Jun 2022 12:51:20 -0700 Subject: [PATCH 025/111] - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) - templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) - Update spec for syslinux->grub2 switch (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ff872dc..92253d2 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,4 @@ /lorax-37.2.tar.gz /lorax-37.3.tar.gz /lorax-37.4.tar.gz +/lorax-37.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 25577a9..56a41eb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.4 +Version: 37.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -61,12 +61,7 @@ Requires: hfsplus-tools %endif %endif -%ifarch %{ix86} x86_64 -Requires: syslinux >= 6.03-1 -Requires: syslinux-nonlinux >= 6.03-1 -%endif - -%ifarch ppc64le +%ifarch %{ix86} x86_64 ppc64le Requires: grub2 Requires: grub2-tools %endif @@ -177,6 +172,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jun 03 2022 Brian C. Lane 37.5-1 +- example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) +- templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) +- Update spec for syslinux->grub2 switch (awilliam@redhat.com) + * Wed Jun 01 2022 Brian C. Lane 37.4-1 - mkksiso: Fix grub2 editing error (bcl@redhat.com) diff --git a/sources b/sources index 9a2eccd..6d66077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.4.tar.gz) = d0623bfb85f0c45d65442a7c3a8ca894de43fcd989a3d6530af46776800753a32cf8dc5cca9947f3fad50228fb4b3e4059d6d3487559be8007d6c8be079e224e +SHA512 (lorax-37.5.tar.gz) = 0545c2434058b4cfa984fe04788ac7f4130cd2f7174171b7936ddc9c3cb0beb6cafa720ffb864fae6635d30063675a8fac3eba191e4274b188e0c6d5a7e62cff From bb692f7caea7a29122a976cd833931bc494e0abc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:51:14 +0200 Subject: [PATCH 026/111] Rebuilt for Python 3.11 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 56a41eb..50ca705 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jun 13 2022 Python Maint - 37.5-2 +- Rebuilt for Python 3.11 + * Fri Jun 03 2022 Brian C. Lane 37.5-1 - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) - templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) From 0dc57a017e49825dd867dbc6e5b141cd758037ca Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 26 May 2022 14:51:22 -0700 Subject: [PATCH 027/111] tests: Update for new mkksiso changes Requires using --ks to pass the kickstart. Adds tests for only adding cmdline parameters, and for removing existing ones. --- tests/scripts/run_tests.sh | 54 ++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 5b62988..0be981b 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -41,7 +41,7 @@ function umount_dirs { function ks_only { running "Add kickstart to iso" - mkksiso $KS $BOOTISO $OUTISO || exit 1 + mkksiso --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -66,17 +66,30 @@ function test_ks { function ks_serial { running "Add kickstart and serial cmdline" - mkksiso -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -c "console=ttyS0,115200n8" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks - test_ks_serial + test_serial status "Add kickstart and serial cmdline" umount_dirs } -function test_ks_serial { +# Only add serial console to cmdline +function only_serial { + running "Add serial cmdline (no ks)" + + mkksiso -c "console=ttyS0,115200n8" $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_serial + + status "Add kickstart and serial cmdline" + umount_dirs +} + +function test_serial { # Is the serial in the BIOS config? grep "console=ttyS0,115200n8" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg cmdline entry" @@ -89,7 +102,7 @@ function test_ks_serial { function new_volid { running "Use a new VOLID" - mkksiso -V "mkksiso-test" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -V "mkksiso-test" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -111,7 +124,7 @@ function test_volid { function add_files { running "Add files" - mkksiso -a /etc/services $KS $BOOTISO $OUTISO || exit 1 + mkksiso -a /etc/services --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -121,6 +134,28 @@ function add_files { umount_dirs } +# Remove quiet from the cmdline +function remove_quiet { + running "remove quiet from cmdline (no ks)" + + mkksiso --rm "quiet" $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_quiet + + status "Remove quiet from cmdline" + umount_dirs +} + +function test_quiet { + # Is quiet in the BIOS config? + ! grep "append.*quiet" "$ISODIR/boot/grub2/grub.cfg" || fail "quiet not removed from BIOS grub.cfg cmdline entry" + + # Is quiet in the UEFI config? + ! grep "linux.*quiet" "$ISODIR/EFI/BOOT/grub.cfg" || fail "quiet not removed from UEFI grub.cfg cmdline entry" +} + + function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" } @@ -129,13 +164,14 @@ function test_files { function run_all { running "Use all the options" - mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -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 - test_ks_serial + test_serial test_volid test_files + test_quiet status "Use all the options" umount_dirs @@ -161,8 +197,10 @@ fi # Test mkksiso on the new boot.iso ks_only ks_serial +only_serial new_volid add_files +remove_quiet run_all exit $FAILANY From 45a8c066609ed0dda1f65a9a1f0fa3a139205e1a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 28 Jun 2022 16:53:21 -0700 Subject: [PATCH 028/111] - tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) - Add include for architecture specific packages to example kickstarts (bcl@redhat.com) - templates: adjust for mellanox firmware split to subpackage (awilliam@redhat.com) - mkksiso: Fix s390x support (bcl@redhat.com) - spec: Don't require grub2 on x86-32 (bcl@redhat.com) - mkksiso: Remove use of os.path.join (bcl@redhat.com) - Makefile: Add mkksiso and image-minimizer to coverage report (bcl@redhat.com) - tests: Add tests for mkksiso (bcl@redhat.com) - mkksiso: Add kernel cmdline customization support (bcl@redhat.com) - mkksiso: Move kickstart to --ks KICKSTART (bcl@redhat.com) - mkksiso: Add helper functions for kernel cmdline modifications (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 20 +++++++++++++++----- sources | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 92253d2..202cbcf 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,4 @@ /lorax-37.3.tar.gz /lorax-37.4.tar.gz /lorax-37.5.tar.gz +/lorax-37.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 50ca705..783ab19 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 37.5 -Release: 2%{?dist} +Version: 37.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -61,7 +61,7 @@ Requires: hfsplus-tools %endif %endif -%ifarch %{ix86} x86_64 ppc64le +%ifarch x86_64 ppc64le Requires: grub2 Requires: grub2-tools %endif @@ -172,8 +172,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jun 13 2022 Python Maint - 37.5-2 -- Rebuilt for Python 3.11 +* Tue Jun 28 2022 Brian C. Lane 37.6-1 +- tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) +- Add include for architecture specific packages to example kickstarts (bcl@redhat.com) +- templates: adjust for mellanox firmware split to subpackage (awilliam@redhat.com) +- mkksiso: Fix s390x support (bcl@redhat.com) +- spec: Don't require grub2 on x86-32 (bcl@redhat.com) +- mkksiso: Remove use of os.path.join (bcl@redhat.com) +- Makefile: Add mkksiso and image-minimizer to coverage report (bcl@redhat.com) +- tests: Add tests for mkksiso (bcl@redhat.com) +- mkksiso: Add kernel cmdline customization support (bcl@redhat.com) +- mkksiso: Move kickstart to --ks KICKSTART (bcl@redhat.com) +- mkksiso: Add helper functions for kernel cmdline modifications (bcl@redhat.com) * Fri Jun 03 2022 Brian C. Lane 37.5-1 - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) diff --git a/sources b/sources index 6d66077..6d1b3b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.5.tar.gz) = 0545c2434058b4cfa984fe04788ac7f4130cd2f7174171b7936ddc9c3cb0beb6cafa720ffb864fae6635d30063675a8fac3eba191e4274b188e0c6d5a7e62cff +SHA512 (lorax-37.6.tar.gz) = b7b34c01d33065e3221ca038c41a52dd5592d71cb613637d81cc4c7f8b2808d067d1d7ab273fb46271411ad8de1baff868adbaf799510c0fcc39c1dd7aa022fc From 6f034f08b726401eaa9687d3a1e433eeb781dddd Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Jul 2022 15:23:16 -0700 Subject: [PATCH 029/111] tests: Add a test to run mkksiso as a user Make sure that running mkksiso as a user works with the boot.iso. Note that this won't catch problems with other isos with different permissions, like the dvd. --- tests/scripts/run_tests.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 0be981b..ea1e625 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -177,6 +177,24 @@ function run_all { umount_dirs } +# All of the changes as a user (lorax-ted) +function run_as_user { + running "Use all the options as a user" + + [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted + su - lorax-ted -c "mkksiso -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 + test_serial + test_volid + test_files + test_quiet + + status "Use all the options as a user" + umount_dirs +} + # Gather up the list of system repo files and use them for lorax @@ -202,5 +220,6 @@ new_volid add_files remove_quiet run_all +run_as_user exit $FAILANY From 4689fced5d695c0439bf51f16552b0f895a6feb5 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Jul 2022 15:24:51 -0700 Subject: [PATCH 030/111] - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) - Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 202cbcf..e9fa447 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,4 @@ /lorax-37.4.tar.gz /lorax-37.5.tar.gz /lorax-37.6.tar.gz +/lorax-37.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 783ab19..d32bd67 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.6 +Version: 37.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -172,6 +172,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jul 13 2022 Brian C. Lane 37.7-1 +- mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) +- Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) + * Tue Jun 28 2022 Brian C. Lane 37.6-1 - tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) - Add include for architecture specific packages to example kickstarts (bcl@redhat.com) diff --git a/sources b/sources index 6d1b3b7..161fd22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.6.tar.gz) = b7b34c01d33065e3221ca038c41a52dd5592d71cb613637d81cc4c7f8b2808d067d1d7ab273fb46271411ad8de1baff868adbaf799510c0fcc39c1dd7aa022fc +SHA512 (lorax-37.7.tar.gz) = 23a4a56bc83e160b3a00dde23a9c590329db2732a23928938444b8a9c1c191dee9e1c9a6bf5166dceb9a0386e341e6dee484e4222f365f7a89746ee65f35791e From 131e3892a16a638160a584ef2744865599c44640 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:53:14 +0000 Subject: [PATCH 031/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index d32bd67..43869d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 37.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Brian C. Lane 37.7-1 - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) - Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) From 76539177e1a3bcfade02d55c94fbb18a4a119258 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Jul 2022 10:39:21 -0700 Subject: [PATCH 032/111] tests: Add test for positional kickstart usage --- tests/scripts/run_tests.sh | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index ea1e625..d544946 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -39,14 +39,27 @@ function umount_dirs { # Only add kickstart function ks_only { - running "Add kickstart to iso" + running "Add kickstart to iso using --ks" mkksiso --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks - status "Add kickstart" + status "Add kickstart to iso using --ks" + umount_dirs +} + +# Only add kickstart +function ks_pos_only { + running "Add kickstart to iso using positional argument" + + mkksiso $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + + status "Add kickstart to iso using positional argument" umount_dirs } @@ -155,6 +168,15 @@ function test_quiet { ! grep "linux.*quiet" "$ISODIR/EFI/BOOT/grub.cfg" || fail "quiet not removed from UEFI grub.cfg cmdline entry" } +# Test error if passing both --ks FILE and 3 arguments +function test_two_kickstarts { + running "Test two kickstart error" + + mkksiso --ks $KS $KS $BOOTISO $OUTISO && fail "No error using --ks and positional argument" + + status "Test two kickstart error" +} + function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" @@ -214,11 +236,13 @@ fi # Test mkksiso on the new boot.iso ks_only +ks_pos_only ks_serial only_serial new_volid add_files remove_quiet +test_two_kickstarts run_all run_as_user From 32547351b37d6624da8febd0e59e49dddea5471d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Jul 2022 10:39:44 -0700 Subject: [PATCH 033/111] - mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) - mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) - mkksiso: Fix passing -iso-level to xorriso (bcl@redhat.com) - pylorax: SafeConfigParser is now ConfigParser (bcl@redhat.com) - test: Update test code for new pylint version (bcl@redhat.com) - tests: Switch back to rawhide for tests (bcl@redhat.com) - workflow: Remove sudo from workflow (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e9fa447..4408cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ /lorax-37.5.tar.gz /lorax-37.6.tar.gz /lorax-37.7.tar.gz +/lorax-37.8.tar.gz diff --git a/lorax.spec b/lorax.spec index 43869d1..fb056d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 37.7 -Release: 2%{?dist} +Version: 37.8 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,8 +172,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 37.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Mon Jul 25 2022 Brian C. Lane 37.8-1 +- mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) +- mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) +- mkksiso: Fix passing -iso-level to xorriso (bcl@redhat.com) +- pylorax: SafeConfigParser is now ConfigParser (bcl@redhat.com) +- test: Update test code for new pylint version (bcl@redhat.com) +- tests: Switch back to rawhide for tests (bcl@redhat.com) +- workflow: Remove sudo from workflow (bcl@redhat.com) * Wed Jul 13 2022 Brian C. Lane 37.7-1 - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) diff --git a/sources b/sources index 161fd22..7dfc877 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.7.tar.gz) = 23a4a56bc83e160b3a00dde23a9c590329db2732a23928938444b8a9c1c191dee9e1c9a6bf5166dceb9a0386e341e6dee484e4222f365f7a89746ee65f35791e +SHA512 (lorax-37.8.tar.gz) = 8669ea6b873f4376cf5cace5d2eaab969bfe49f5f594f3bb0968319049c99d052379bfb7c6e5233bae7aa6a525c61c5220a3a0b3e58c7bbbecf1d72498ded25f From aa53f6d1f3925044c4a0ce8d6be5a0689460c187 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 30 Sep 2022 09:44:18 -0700 Subject: [PATCH 034/111] - New lorax documentation - 38.0 (bcl@redhat.com) - tests: Update test_creator.py for new cmdline options (bcl@redhat.com) - livemedia-creator: Add release, variant, bugurl, and isfinal cmdline flags (cappy@cappuchino.xyz) - Drop 32-bit ARM and x86 support (awilliam@redhat.com) - Update anaconda's crash messages to watch (vslavik@redhat.com) - livemedia-creator: Add --product to cmdline args (bcl@redhat.com) - fedora-livemedia: Make sure GNOME Software service isn't started (bcl@redhat.com) - fonts packages syncup in template files (akira@tagoh.org) - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4408cb5..849e4da 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ /lorax-37.6.tar.gz /lorax-37.7.tar.gz /lorax-37.8.tar.gz +/lorax-38.0.tar.gz diff --git a/lorax.spec b/lorax.spec index fb056d1..ab5414f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.8 +Version: 38.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -71,10 +71,6 @@ Requires: openssh Requires: s390utils >= 2.15.0-2 %endif -%ifarch %{arm} -Requires: uboot-tools -%endif - # Moved image-minimizer tool to lorax Provides: appliance-tools-minimizer = %{version}-%{release} Obsoletes: appliance-tools-minimizer < 007.7-3 @@ -99,7 +95,7 @@ Requires: lorax = %{version}-%{release} Requires: qemu # Fedora edk2 builds currently only support these arches -%ifarch %{ix86} x86_64 %{arm} aarch64 +%ifarch x86_64 aarch64 Requires: edk2-ovmf %endif Recommends: qemu-kvm @@ -172,6 +168,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Sep 30 2022 Brian C. Lane 38.0-1 +- New lorax documentation - 38.0 (bcl@redhat.com) +- tests: Update test_creator.py for new cmdline options (bcl@redhat.com) +- livemedia-creator: Add release, variant, bugurl, and isfinal cmdline flags (cappy@cappuchino.xyz) +- Drop 32-bit ARM and x86 support (awilliam@redhat.com) +- Update anaconda's crash messages to watch (vslavik@redhat.com) +- livemedia-creator: Add --product to cmdline args (bcl@redhat.com) +- fedora-livemedia: Make sure GNOME Software service isn't started (bcl@redhat.com) +- fonts packages syncup in template files (akira@tagoh.org) +- tests: Add tzdata package to minimizer test setup (bcl@redhat.com) + * Mon Jul 25 2022 Brian C. Lane 37.8-1 - mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) - mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) diff --git a/sources b/sources index 7dfc877..de17f28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.8.tar.gz) = 8669ea6b873f4376cf5cace5d2eaab969bfe49f5f594f3bb0968319049c99d052379bfb7c6e5233bae7aa6a525c61c5220a3a0b3e58c7bbbecf1d72498ded25f +SHA512 (lorax-38.0.tar.gz) = f2ab184cc5654065631a13ad25a5f990c967f1f372ede6cd6221a51ed2d40cc87d14fd1a40e2c8b62b4e10fdc3c6805eecef64623f736687d83f15691a01ab56 From 78348e8ac30d11242bf0dc266e636f6d0ec0bc52 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 11 Oct 2022 09:54:46 -0700 Subject: [PATCH 035/111] - livemedia-creator: Allow file: url without networking (bcl@redhat.com) - Update kdump addon package name (vslavik@redhat.com) - Drop anaconda auditd replacement (vslavik@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 849e4da..80d7e60 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ /lorax-37.7.tar.gz /lorax-37.8.tar.gz /lorax-38.0.tar.gz +/lorax-38.1.tar.gz diff --git a/lorax.spec b/lorax.spec index ab5414f..681ab46 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.0 +Version: 38.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 11 2022 Brian C. Lane 38.1-1 +- livemedia-creator: Allow file: url without networking (bcl@redhat.com) +- Update kdump addon package name (vslavik@redhat.com) +- Drop anaconda auditd replacement (vslavik@redhat.com) + * Fri Sep 30 2022 Brian C. Lane 38.0-1 - New lorax documentation - 38.0 (bcl@redhat.com) - tests: Update test_creator.py for new cmdline options (bcl@redhat.com) diff --git a/sources b/sources index de17f28..5cd177c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.0.tar.gz) = f2ab184cc5654065631a13ad25a5f990c967f1f372ede6cd6221a51ed2d40cc87d14fd1a40e2c8b62b4e10fdc3c6805eecef64623f736687d83f15691a01ab56 +SHA512 (lorax-38.1.tar.gz) = 58b5e0a1a1cf4a0fe8167ec9913b5ef7aec7f6715ac3983ed69911ab0945834f5b9f23b824da3efd6bf5f1305c5c33b1640e1483b78269acaea992a531c7ac63 From 5982dc4e712683a17bd6201564469144cda77ad9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Nov 2022 15:44:53 -0800 Subject: [PATCH 036/111] - runtime-postinstall: Disable sshd.socket (bcl@redhat.com) - docs: Document mock and SELinux not working together (bcl@redhat.com) - imgutils: Don't delete dirs created for DracutChroot (bcl@redhat.com) - tito: Use .tito instead of old ./rel-eng directory (bcl@redhat.com) - setup.py: Set the version number (bcl@redhat.com) - Improvement of unmounting /proc, /dev and binds (soksanichenko@cloudlinux.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 80d7e60..3f2728e 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /lorax-37.8.tar.gz /lorax-38.0.tar.gz /lorax-38.1.tar.gz +/lorax-38.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 681ab46..4261eac 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.1 +Version: 38.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Nov 09 2022 Brian C. Lane 38.2-1 +- runtime-postinstall: Disable sshd.socket (bcl@redhat.com) +- docs: Document mock and SELinux not working together (bcl@redhat.com) +- imgutils: Don't delete dirs created for DracutChroot (bcl@redhat.com) +- tito: Use .tito instead of old ./rel-eng directory (bcl@redhat.com) +- setup.py: Set the version number (bcl@redhat.com) +- Improvement of unmounting /proc, /dev and binds (soksanichenko@cloudlinux.com) + * Tue Oct 11 2022 Brian C. Lane 38.1-1 - livemedia-creator: Allow file: url without networking (bcl@redhat.com) - Update kdump addon package name (vslavik@redhat.com) diff --git a/sources b/sources index 5cd177c..8d2b0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.1.tar.gz) = 58b5e0a1a1cf4a0fe8167ec9913b5ef7aec7f6715ac3983ed69911ab0945834f5b9f23b824da3efd6bf5f1305c5c33b1640e1483b78269acaea992a531c7ac63 +SHA512 (lorax-38.2.tar.gz) = a11aa2bd0db5506b123ed23c369acc39c52fd3d64e669c4282152d7347a800227446678c976977f7677d4ee56d5b7fc2974389e5eca69c7a586aa1cb9d8204e5 From 0e886e07cc3eec18becc1cfccb4b62aa14239c75 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 14:42:19 -0800 Subject: [PATCH 037/111] - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f2728e..a77295a 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,4 @@ /lorax-38.0.tar.gz /lorax-38.1.tar.gz /lorax-38.2.tar.gz +/lorax-38.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 4261eac..59dd0da 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.2 +Version: 38.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Nov 28 2022 Brian C. Lane 38.3-1 +- Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) +- On ppc64le Use core.elf from grub2 package (bcl@redhat.com) + * Wed Nov 09 2022 Brian C. Lane 38.2-1 - runtime-postinstall: Disable sshd.socket (bcl@redhat.com) - docs: Document mock and SELinux not working together (bcl@redhat.com) diff --git a/sources b/sources index 8d2b0fa..6d6f53b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.2.tar.gz) = a11aa2bd0db5506b123ed23c369acc39c52fd3d64e669c4282152d7347a800227446678c976977f7677d4ee56d5b7fc2974389e5eca69c7a586aa1cb9d8204e5 +SHA512 (lorax-38.3.tar.gz) = 9ef2d8fd05ae718298d176f76d21fe2ac557edd896ee4e87a25ff62f0d9fe5f2c8e818a1ca28484619a01b3b9d6fe6716640087e150791abd6644e4d4db338b1 From 1d493d6f0168fcf6e5b13784ea98317a3d51453f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 12 Dec 2022 14:23:28 -0800 Subject: [PATCH 038/111] - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) - runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) - runtime-install: drop bfa-firmware (awilliam@redhat.com) - mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) - mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) - gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) - fedora-livemedia.ks: Use livesys-scripts (bcl@redhat.com) - workflows: Switch to actions/checkout@v3 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a77295a..6429710 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ /lorax-38.1.tar.gz /lorax-38.2.tar.gz /lorax-38.3.tar.gz +/lorax-38.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 59dd0da..81f509f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.3 +Version: 38.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 12 2022 Brian C. Lane 38.4-1 +- runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) +- runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) +- runtime-install: drop bfa-firmware (awilliam@redhat.com) +- mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) +- mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) +- gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) +- fedora-livemedia.ks: Use livesys-scripts (bcl@redhat.com) +- workflows: Switch to actions/checkout@v3 (bcl@redhat.com) + * Mon Nov 28 2022 Brian C. Lane 38.3-1 - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) diff --git a/sources b/sources index 6d6f53b..03d03af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.3.tar.gz) = 9ef2d8fd05ae718298d176f76d21fe2ac557edd896ee4e87a25ff62f0d9fe5f2c8e818a1ca28484619a01b3b9d6fe6716640087e150791abd6644e4d4db338b1 +SHA512 (lorax-38.4.tar.gz) = 47dc632f7b03417b71b067c1a267b9570f417feb02dc84b5cc26d637711b07e40c255b26e4d2d09e961bb802b7beed41beb9a05f9a1d34ede120c6e187d8ae60 From 26136aa21011ea07c44c1855ce304b404d3aad70 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 13 Dec 2022 10:26:01 -0800 Subject: [PATCH 039/111] - Run user test with --skip-mkefiboot --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index 81f509f..a4c3e3c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 13 2022 Brian C. Lane - 38.4-2 +- Run user test with --skip-mkefiboot + * Mon Dec 12 2022 Brian C. Lane 38.4-1 - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) - runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index d544946..3559b7d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -199,12 +199,12 @@ function run_all { umount_dirs } -# All of the changes as a user (lorax-ted) +# All of the changes as a user (lorax-ted) with --skip-mkefiboot function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + su - lorax-ted -c "mkksiso --skip-mkefiboot -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 @@ -213,7 +213,7 @@ function run_as_user { test_files test_quiet - status "Use all the options as a user" + status "Use all the options as a user with --skip-mkefiboot" umount_dirs } From b7f754255297da7d70049ed0ad7a84677f619b93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:18:21 +0000 Subject: [PATCH 040/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index a4c3e3c..cc61649 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 38.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 13 2022 Brian C. Lane - 38.4-2 - Run user test with --skip-mkefiboot From 9e52dbb4bd3336d1f78640b6726af14e4c168241 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 8 Feb 2023 14:28:16 -0800 Subject: [PATCH 041/111] - Fix using --dracut-conf with DracutChroot (bcl@redhat.com) - tests: Fix DataHolder for CreatorTest (bcl@redhat.com) - runtime-install: Update for https://fedoraproject.org/wiki/Changes/NotoFontsForMoreLang (akira@tagoh.org) - SPDX migration (bcl@redhat.com) - rsyslogd.conf: Rewrite using current config syntax (bcl@redhat.com) - Add comment for squashfs-only (dick@mrns.nl) - runtime-install: exclude some more unneeded firmware packages (awilliam@redhat.com) - runtime-install: stop excluding bfa-firmware again (retired) (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6429710..5fa272f 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ /lorax-38.2.tar.gz /lorax-38.3.tar.gz /lorax-38.4.tar.gz +/lorax-38.5.tar.gz diff --git a/lorax.spec b/lorax.spec index cc61649..7a9989e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,11 +3,11 @@ %define debug_package %{nil} Name: lorax -Version: 38.4 -Release: 3%{?dist} +Version: 38.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/weldr/lorax # To generate Source0 do: # git clone https://github.com/weldr/lorax @@ -168,11 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 38.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 13 2022 Brian C. Lane - 38.4-2 -- Run user test with --skip-mkefiboot +* Wed Feb 08 2023 Brian C. Lane 38.5-1 +- Fix using --dracut-conf with DracutChroot (bcl@redhat.com) +- tests: Fix DataHolder for CreatorTest (bcl@redhat.com) +- runtime-install: Update for + https://fedoraproject.org/wiki/Changes/NotoFontsForMoreLang (akira@tagoh.org) +- SPDX migration (bcl@redhat.com) +- rsyslogd.conf: Rewrite using current config syntax (bcl@redhat.com) +- Add comment for squashfs-only (dick@mrns.nl) +- runtime-install: exclude some more unneeded firmware packages (awilliam@redhat.com) +- runtime-install: stop excluding bfa-firmware again (retired) (awilliam@redhat.com) * Mon Dec 12 2022 Brian C. Lane 38.4-1 - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) diff --git a/sources b/sources index 03d03af..def9a8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.4.tar.gz) = 47dc632f7b03417b71b067c1a267b9570f417feb02dc84b5cc26d637711b07e40c255b26e4d2d09e961bb802b7beed41beb9a05f9a1d34ede120c6e187d8ae60 +SHA512 (lorax-38.5.tar.gz) = a48639502131b8a4d34bfb6c56ab7915c6d4329bcbc469f6cacd8cf54580ffce26e1a6effb971d61f9fa0f9e78849780c6aa01f672f4c4e28fce872453b0a907 From 6c25ce1056a57d9432effe245f4bf1c38d2d5b75 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Feb 2023 10:18:59 -0800 Subject: [PATCH 042/111] - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) - Update for Noto CJK Variable Fonts (pwu@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5fa272f..b9fc9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -228,3 +228,4 @@ /lorax-38.3.tar.gz /lorax-38.4.tar.gz /lorax-38.5.tar.gz +/lorax-38.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 7a9989e..1b3ee29 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.5 +Version: 38.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Feb 14 2023 Brian C. Lane 38.6-1 +- templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) +- Update for Noto CJK Variable Fonts (pwu@redhat.com) + * Wed Feb 08 2023 Brian C. Lane 38.5-1 - Fix using --dracut-conf with DracutChroot (bcl@redhat.com) - tests: Fix DataHolder for CreatorTest (bcl@redhat.com) diff --git a/sources b/sources index def9a8b..020d317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.5.tar.gz) = a48639502131b8a4d34bfb6c56ab7915c6d4329bcbc469f6cacd8cf54580ffce26e1a6effb971d61f9fa0f9e78849780c6aa01f672f4c4e28fce872453b0a907 +SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2 From 78425032ee0dde61cad8ddf91d276166dda68736 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Feb 2023 21:27:49 -0800 Subject: [PATCH 043/111] Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose --- 0001-Strip-some-things-from-gtk4.patch | 31 ++++++++++++++++++++++++++ lorax.spec | 10 ++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Strip-some-things-from-gtk4.patch diff --git a/0001-Strip-some-things-from-gtk4.patch b/0001-Strip-some-things-from-gtk4.patch new file mode 100644 index 0000000..215da43 --- /dev/null +++ b/0001-Strip-some-things-from-gtk4.patch @@ -0,0 +1,31 @@ +From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 15 Feb 2023 21:20:34 -0800 +Subject: [PATCH] Strip some things from gtk4 + +gtk4 is now getting sucked into installer images because mutter +depends on it (since 44-beta). Strip some stuff the installer +env currently doesn't need. The /usr/bin/* removal may not be +safe long-term, but it should be OK for now. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 31dd44ee..6e0d8e88 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font + removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf + removefrom grep /etc/* /usr/share/locale/* + removefrom gtk3 /usr/${libdir}/gtk-3.0/* ++removefrom gtk4 /usr/${libdir}/gtk-4.0/* ++removefrom gtk4 /usr/bin/* + removefrom guile22 /usr/${libdir}/guile/2.2/ccache* + removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} + removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 1b3ee29..682c1ec 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,11 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Strip some stuff from gtk4, necessary for compose to work since +# gtk4-launch requires libtiff which is stripped itself +# https://github.com/weldr/lorax/pull/1309 +# https://pagure.io/releng/failed-composes/issue/4611 +Patch0: 0001-Strip-some-things-from-gtk4.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +173,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 15 2023 Adam Williamson - 38.6-2 +- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose + * Tue Feb 14 2023 Brian C. Lane 38.6-1 - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) - Update for Noto CJK Variable Fonts (pwu@redhat.com) From c61ef2b61e46728bb754c96e19fbbb8b698b4088 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Feb 2023 21:28:38 -0800 Subject: [PATCH 044/111] Apply the patch (using autosetup) --- lorax.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 682c1ec..25683d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -131,7 +131,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build From c00cc2a98b99170c1f4a00269a58498554227bda Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 Feb 2023 10:30:09 -0800 Subject: [PATCH 045/111] Backport #1310 to disable persistence again, it's busted (#2170544) --- ....d-99-generic-live-Enable-automatic-.patch | 144 ++++++++++++++++++ lorax.spec | 9 +- 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch diff --git a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch new file mode 100644 index 0000000..32d69ed --- /dev/null +++ b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch @@ -0,0 +1,144 @@ +From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 16 Feb 2023 09:53:05 -0800 +Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic + persistence for live media" + +This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e. +Initial testing indicates it's busted: +https://bugzilla.redhat.com/show_bug.cgi?id=2170544 +--- + .../live/config_files/aarch64/grub2-efi.cfg | 26 ++++--------------- + .../live/config_files/x86/grub2-bios.cfg | 26 ++++--------------- + .../live/config_files/x86/grub2-efi.cfg | 26 ++++--------------- + 3 files changed, 15 insertions(+), 63 deletions(-) + +diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +index d4f7bf5e..c874547f 100644 +--- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg ++++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +@@ -26,32 +26,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrd @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrd @INITRDPATH@ + } +diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg +index 486d8548..5987cf62 100644 +--- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg ++++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg +@@ -17,32 +17,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrd @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrd @INITRDPATH@ + } +diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +index 7595571e..39069585 100644 +--- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg ++++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +@@ -20,32 +20,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrdefi @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrdefi @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrdefi @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrdefi @INITRDPATH@ + } +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 25683d1..44e6f73 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -19,6 +19,10 @@ Source0: %{name}-%{version}.tar.gz # https://github.com/weldr/lorax/pull/1309 # https://pagure.io/releng/failed-composes/issue/4611 Patch0: 0001-Strip-some-things-from-gtk4.patch +# Disable default persistence, it's busted: +# https://bugzilla.redhat.com/show_bug.cgi?id=2170544 +# https://github.com/weldr/lorax/pull/1310 +Patch1: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -173,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Feb 16 2023 Adam Williamson - 38.6-3 +- Backport PR #1310 to disable persistence again, it's busted (#2170544) + * Wed Feb 15 2023 Adam Williamson - 38.6-2 - Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose From e0d8f46b08f7f9432e37e3d59d98a9334e2bb88c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Feb 2023 18:16:58 -0800 Subject: [PATCH 046/111] Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) --- ...rip-gtk4-binaries-or-libtiff-2170716.patch | 42 +++++++++++++++++++ lorax.spec | 15 +++++-- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch diff --git a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch new file mode 100644 index 0000000..b588d34 --- /dev/null +++ b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch @@ -0,0 +1,42 @@ +From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 17 Feb 2023 08:55:02 -0800 +Subject: [PATCH] Don't strip gtk4 binaries or libtiff (#2170716) + +It turns out that, somehow, stripping the gtk4 binaries caused: +https://bugzilla.redhat.com/show_bug.cgi?id=2170716 +at least, I tested a scratch build with this change and that bug +didn't seem to happen any more. This puts the gtk4 binaries back, +and also stops stripping libtiff, because gtk4-launch depends on +it so we need to keep it in. This doesn't seem to cause too much +of a size difference; I see 723417088 bytes for the netinst with +this change, compared to 723197952 bytes for today's nightly. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 6e0d8e88..6577a45c 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -53,7 +53,6 @@ removepkg mtools glibc-gconv-extra + ## various other things we remove to save space + removepkg diffutils file + removepkg libasyncns +-removepkg libtiff + removepkg lvm2-libs + removepkg mobile-broadband-provider-info + removepkg rmt rpcbind squashfs-tools +@@ -180,7 +179,6 @@ removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-It + removefrom grep /etc/* /usr/share/locale/* + removefrom gtk3 /usr/${libdir}/gtk-3.0/* + removefrom gtk4 /usr/${libdir}/gtk-4.0/* +-removefrom gtk4 /usr/bin/* + removefrom guile22 /usr/${libdir}/guile/2.2/ccache* + removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} + removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 44e6f73..b3ac0e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,14 +15,20 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz # Strip some stuff from gtk4, necessary for compose to work since -# gtk4-launch requires libtiff which is stripped itself +# gtk4-launch requires libtiff which is stripped itself... # https://github.com/weldr/lorax/pull/1309 # https://pagure.io/releng/failed-composes/issue/4611 Patch0: 0001-Strip-some-things-from-gtk4.patch +# ...only it turns out we really need at least one of the binaries +# or a window in anaconda doesn't open, so this puts them back +# and stops stripping libtiff +# https://github.com/weldr/lorax/pull/1312 +# https://bugzilla.redhat.com/show_bug.cgi?id=2170716 +Patch1: 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch # Disable default persistence, it's busted: # https://bugzilla.redhat.com/show_bug.cgi?id=2170544 # https://github.com/weldr/lorax/pull/1310 -Patch1: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch +Patch2: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -177,6 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Feb 17 2023 Adam Williamson - 38.6-4 +- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) + * Thu Feb 16 2023 Adam Williamson - 38.6-3 - Backport PR #1310 to disable persistence again, it's busted (#2170544) From 00039d31afc9eddc3eb9ceba9da0b0221a25c0c8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Mar 2023 11:07:56 -0700 Subject: [PATCH 047/111] - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) - livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) - New lorax documentation - 39.0 (bcl@redhat.com) - workflow: Update list of push branches for workflow tests (bcl@redhat.com) - Prepare for version 39.0 release (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 42 ++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index b9fc9b0..e4414ef 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ /lorax-38.4.tar.gz /lorax-38.5.tar.gz /lorax-38.6.tar.gz +/lorax-39.0.tar.gz diff --git a/lorax.spec b/lorax.spec index b3ac0e9..238ae88 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 38.6 -Release: 4%{?dist} +Version: 39.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,21 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Strip some stuff from gtk4, necessary for compose to work since -# gtk4-launch requires libtiff which is stripped itself... -# https://github.com/weldr/lorax/pull/1309 -# https://pagure.io/releng/failed-composes/issue/4611 -Patch0: 0001-Strip-some-things-from-gtk4.patch -# ...only it turns out we really need at least one of the binaries -# or a window in anaconda doesn't open, so this puts them back -# and stops stripping libtiff -# https://github.com/weldr/lorax/pull/1312 -# https://bugzilla.redhat.com/show_bug.cgi?id=2170716 -Patch1: 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch -# Disable default persistence, it's busted: -# https://bugzilla.redhat.com/show_bug.cgi?id=2170544 -# https://github.com/weldr/lorax/pull/1310 -Patch2: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -183,14 +168,23 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Feb 17 2023 Adam Williamson - 38.6-4 -- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) +* Tue Mar 14 2023 Brian C. Lane 39.0-1 +- Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) +- livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) +- New lorax documentation - 39.0 (bcl@redhat.com) +- workflow: Update list of push branches for workflow tests (bcl@redhat.com) +- Prepare for version 39.0 release (bcl@redhat.com) -* Thu Feb 16 2023 Adam Williamson - 38.6-3 -- Backport PR #1310 to disable persistence again, it's busted (#2170544) - -* Wed Feb 15 2023 Adam Williamson - 38.6-2 -- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose +* Mon Feb 20 2023 Brian C. Lane 38.7-1 +- Don't strip gtk4 binaries or libtiff (#2170716) (awilliam@redhat.com) +- image-minimizer: Use RuntimeError instead of Exception (bcl@redhat.com) +- creator: Use RuntimeError instead of Exception (bcl@redhat.com) +- treebuilder: Use RuntimeError instead of Exception (bcl@redhat.com) +- mount: Use RuntimeError instead of Exception (bcl@redhat.com) +- ltmpl: Use RuntimeError instead of Exception (bcl@redhat.com) +- spec: Use autosetup to make patching easier (bcl@redhat.com) +- Revert "templates.d/99-generic/live: Enable automatic persistence for live media" (awilliam@redhat.com) +- Strip some things from gtk4 (awilliam@redhat.com) * Tue Feb 14 2023 Brian C. Lane 38.6-1 - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) diff --git a/sources b/sources index 020d317..cdfb939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2 +SHA512 (lorax-39.0.tar.gz) = 645500331f5226df833535982f2bfe6fdb17132168a24020928a0a36f42ed058520247a6019356e2bd308a5936b2a0f576323c2d3c322d9a9c31e8b8ca115ea1 From 13a5a44a48acbc9750f760def55ab09a1e52e171 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 31 May 2023 13:51:40 -0700 Subject: [PATCH 048/111] - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) - Make sure -machine is passed to qemu (hadess@hadess.net) - Only allow UEFI support to be enabled on x86_64 (hadess@hadess.net) - Throw an error when KVM is enabled on non-native installs (hadess@hadess.net) - docs: Clarify that kickstarts need a part command (bcl@redhat.com) - livemedia-creator: Raise an error when no partitions are in the ks (bcl@redhat.com) - monitor: Skip repo errors involving CDROM/file source (bcl@redhat.com) - logging: Remove duplicate stream logging (bcl@redhat.com) - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) - livemedia-creator: Use -cpu host by default, add -cpu option to override (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e4414ef..05c4d25 100644 --- a/.gitignore +++ b/.gitignore @@ -230,3 +230,4 @@ /lorax-38.5.tar.gz /lorax-38.6.tar.gz /lorax-39.0.tar.gz +/lorax-39.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 238ae88..82c23f3 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.0 +Version: 39.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 31 2023 Brian C. Lane 39.1-1 +- livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) +- Make sure -machine is passed to qemu (hadess@hadess.net) +- Only allow UEFI support to be enabled on x86_64 (hadess@hadess.net) +- Throw an error when KVM is enabled on non-native installs (hadess@hadess.net) +- docs: Clarify that kickstarts need a part command (bcl@redhat.com) +- livemedia-creator: Raise an error when no partitions are in the ks (bcl@redhat.com) +- monitor: Skip repo errors involving CDROM/file source (bcl@redhat.com) +- logging: Remove duplicate stream logging (bcl@redhat.com) +- Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) +- livemedia-creator: Use -cpu host by default, add -cpu option to override (bcl@redhat.com) + * Tue Mar 14 2023 Brian C. Lane 39.0-1 - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) - livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) diff --git a/sources b/sources index cdfb939..d9ffacb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.0.tar.gz) = 645500331f5226df833535982f2bfe6fdb17132168a24020928a0a36f42ed058520247a6019356e2bd308a5936b2a0f576323c2d3c322d9a9c31e8b8ca115ea1 +SHA512 (lorax-39.1.tar.gz) = b077849e56bdfb5d5a5a6d2b1e5dfe22f8e1ba625ad5b8bfcadb9f918565fa4897583cf105f78005ade316e6f85efac483c36d076896e4937f5fd1ee1756fb6e From 6d58144ab9c91ee30a0d9a3e1685d70553e0618b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:25 +0200 Subject: [PATCH 049/111] Rebuilt for Python 3.12 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 82c23f3..eb4ac72 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jun 13 2023 Python Maint - 39.1-2 +- Rebuilt for Python 3.12 + * Wed May 31 2023 Brian C. Lane 39.1-1 - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) - Make sure -machine is passed to qemu (hadess@hadess.net) From a05a5b0c895e86bc5ac9c628849c3abbe1e17989 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 30 Jun 2023 10:34:27 -0700 Subject: [PATCH 050/111] Drop merged patch files --- ...rip-gtk4-binaries-or-libtiff-2170716.patch | 42 ----- ....d-99-generic-live-Enable-automatic-.patch | 144 ------------------ 0001-Strip-some-things-from-gtk4.patch | 31 ---- 3 files changed, 217 deletions(-) delete mode 100644 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch delete mode 100644 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch delete mode 100644 0001-Strip-some-things-from-gtk4.patch diff --git a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch deleted file mode 100644 index b588d34..0000000 --- a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 17 Feb 2023 08:55:02 -0800 -Subject: [PATCH] Don't strip gtk4 binaries or libtiff (#2170716) - -It turns out that, somehow, stripping the gtk4 binaries caused: -https://bugzilla.redhat.com/show_bug.cgi?id=2170716 -at least, I tested a scratch build with this change and that bug -didn't seem to happen any more. This puts the gtk4 binaries back, -and also stops stripping libtiff, because gtk4-launch depends on -it so we need to keep it in. This doesn't seem to cause too much -of a size difference; I see 723417088 bytes for the netinst with -this change, compared to 723197952 bytes for today's nightly. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 6e0d8e88..6577a45c 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -53,7 +53,6 @@ removepkg mtools glibc-gconv-extra - ## various other things we remove to save space - removepkg diffutils file - removepkg libasyncns --removepkg libtiff - removepkg lvm2-libs - removepkg mobile-broadband-provider-info - removepkg rmt rpcbind squashfs-tools -@@ -180,7 +179,6 @@ removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-It - removefrom grep /etc/* /usr/share/locale/* - removefrom gtk3 /usr/${libdir}/gtk-3.0/* - removefrom gtk4 /usr/${libdir}/gtk-4.0/* --removefrom gtk4 /usr/bin/* - removefrom guile22 /usr/${libdir}/guile/2.2/ccache* - removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} - removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids --- -2.39.1 - diff --git a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch deleted file mode 100644 index 32d69ed..0000000 --- a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 16 Feb 2023 09:53:05 -0800 -Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic - persistence for live media" - -This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e. -Initial testing indicates it's busted: -https://bugzilla.redhat.com/show_bug.cgi?id=2170544 ---- - .../live/config_files/aarch64/grub2-efi.cfg | 26 ++++--------------- - .../live/config_files/x86/grub2-bios.cfg | 26 ++++--------------- - .../live/config_files/x86/grub2-efi.cfg | 26 ++++--------------- - 3 files changed, 15 insertions(+), 63 deletions(-) - -diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -index d4f7bf5e..c874547f 100644 ---- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -+++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -@@ -26,32 +26,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrd @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrd @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrd @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrd @INITRDPATH@ - } -diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -index 486d8548..5987cf62 100644 ---- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -@@ -17,32 +17,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrd @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrd @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrd @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrd @INITRDPATH@ - } -diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -index 7595571e..39069585 100644 ---- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -@@ -20,32 +20,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrdefi @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrdefi @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrdefi @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrdefi @INITRDPATH@ - } --- -2.39.1 - diff --git a/0001-Strip-some-things-from-gtk4.patch b/0001-Strip-some-things-from-gtk4.patch deleted file mode 100644 index 215da43..0000000 --- a/0001-Strip-some-things-from-gtk4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 15 Feb 2023 21:20:34 -0800 -Subject: [PATCH] Strip some things from gtk4 - -gtk4 is now getting sucked into installer images because mutter -depends on it (since 44-beta). Strip some stuff the installer -env currently doesn't need. The /usr/bin/* removal may not be -safe long-term, but it should be OK for now. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 31dd44ee..6e0d8e88 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font - removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf - removefrom grep /etc/* /usr/share/locale/* - removefrom gtk3 /usr/${libdir}/gtk-3.0/* -+removefrom gtk4 /usr/${libdir}/gtk-4.0/* -+removefrom gtk4 /usr/bin/* - removefrom guile22 /usr/${libdir}/guile/2.2/ccache* - removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} - removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids --- -2.39.1 - From 516d709e141d5370ffbb39e136d21d1b24c93a42 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 12:31:16 -0700 Subject: [PATCH 051/111] Backport PR #1332 to handle renamed iwl firmware packages --- ...exclude-renamed-iwl-firmware-package.patch | 57 +++++++++++++++++++ lorax.spec | 9 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch new file mode 100644 index 0000000..7dba08f --- /dev/null +++ b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch @@ -0,0 +1,57 @@ +From b0e04f47313eeb276ac57db6e769799cea25cc0b Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 4 Jul 2023 08:45:03 -0700 +Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages + +@pbrobinson renamed the Intel wireless firmware packages in +the 20230625 build of linux-firmware. This causes installer +image builds to fail because they want to pull in the old packages +from the release repo because they fall in the "*-firmware" glob, +but those packages are now obsoleted by the newer ones from +updates/updates-testing, and dnf doesn't like that. This should +resolve the problem by specifically excluding all the renamed +packages from the glob. Of course, this change must go along +with the newer linux-firmware package, or else you'll get an +image that's missing a lot of wireless firmware. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index f8f988b8..15177467 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -28,6 +28,10 @@ installpkg grubby + ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 + ## bfa-firmware contains only obsolete files - see + ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 ++ ## various iwl package names were changed in linux-firmware-20230625-151 ++ ## so need to be excluded or else dnf gets sad - see ++ ## https://pagure.io/releng/issue/11511 . These exclusions can ++ ## be dropped after F38 goes EOL + installpkg --optional *-firmware --except alsa* --except midisport-firmware \ + --except crystalhd-firmware --except ivtv-firmware \ + --except cx18-firmware --except iscan-firmware \ +@@ -36,7 +40,16 @@ installpkg grubby + --except liquidio-firmware --except netronome-firmware \ + --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ + --except hackrf-firmware --except python-virt-firmware \ +- --except python3-virt-firmware ++ --except python3-virt-firmware \ ++ --except iwl3945-firmware --except iwl4965-firmware \ ++ --except iwl100-firmware --except iwl105-firmware \ ++ --except iwl135-firmware --except iwl1000-firmware \ ++ --except iwl2000-firmware --except iwl2030-firmware \ ++ --except iwl5000-firmware --except iwl5150-firmware \ ++ --except iwl6000-firmware --except iwl6000g2a-firmware \ ++ --except iwl6000g2b-firmware --except iwl6050-firmware \ ++ --except iwl3160-firmware --except iwl7260-firmware \ ++ --except iwlax2xx-firmware + installpkg b43-openfwwf + %endif + +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index eb4ac72..5f71f4d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1332 +# https://pagure.io/releng/issue/11511 +# adapt to renamed iwl firmware packages +Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 04 2023 Adam Williamson - 39.1-3 +- Backport PR #1332 to handle renamed iwl firmware packages + * Tue Jun 13 2023 Python Maint - 39.1-2 - Rebuilt for Python 3.12 From ff16001b692dac9b39c8dcd32502d703b7361601 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 12:46:19 -0700 Subject: [PATCH 052/111] Rebuilt for Python 3.12 again --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 5f71f4d..91e7400 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 04 2023 Adam Williamson - 39.1-4 +- Rebuilt for Python 3.12 again + * Tue Jul 04 2023 Adam Williamson - 39.1-3 - Backport PR #1332 to handle renamed iwl firmware packages From 86e0a84b54e347e7be0ae61b269425d012704e6e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 14 Jul 2023 11:25:16 -0700 Subject: [PATCH 053/111] - drop included patches - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) - tests: Fix HFS test to work with new get_file_magic output (bcl@redhat.com) - ltmpl: Use ProcMount while running the dnf transaction (bcl@redhat.com) - imgutils: Split part DracutChroot into ProcMount (bcl@redhat.com) - runtime-postinstall: Remove libuser.conf (bcl@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) - test_minimizer: dnf5 wants --use-host-config (bcl@redhat.com) - Install nvme-cli tool and remove machine specific nvme files (bcl@redhat.com) - Revert "Add blacklist_exceptions to multipath.conf" (jstodola@redhat.com) --- .gitignore | 1 + ...exclude-renamed-iwl-firmware-package.patch | 57 ------------------- lorax.spec | 27 +++++---- sources | 2 +- 4 files changed, 15 insertions(+), 72 deletions(-) delete mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/.gitignore b/.gitignore index 05c4d25..e3411c8 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ /lorax-38.6.tar.gz /lorax-39.0.tar.gz /lorax-39.1.tar.gz +/lorax-39.2.tar.gz diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch deleted file mode 100644 index 7dba08f..0000000 --- a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b0e04f47313eeb276ac57db6e769799cea25cc0b Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 4 Jul 2023 08:45:03 -0700 -Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages - -@pbrobinson renamed the Intel wireless firmware packages in -the 20230625 build of linux-firmware. This causes installer -image builds to fail because they want to pull in the old packages -from the release repo because they fall in the "*-firmware" glob, -but those packages are now obsoleted by the newer ones from -updates/updates-testing, and dnf doesn't like that. This should -resolve the problem by specifically excluding all the renamed -packages from the glob. Of course, this change must go along -with the newer linux-firmware package, or else you'll get an -image that's missing a lot of wireless firmware. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index f8f988b8..15177467 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -28,6 +28,10 @@ installpkg grubby - ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - ## bfa-firmware contains only obsolete files - see - ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 -+ ## various iwl package names were changed in linux-firmware-20230625-151 -+ ## so need to be excluded or else dnf gets sad - see -+ ## https://pagure.io/releng/issue/11511 . These exclusions can -+ ## be dropped after F38 goes EOL - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ -@@ -36,7 +40,16 @@ installpkg grubby - --except liquidio-firmware --except netronome-firmware \ - --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ - --except hackrf-firmware --except python-virt-firmware \ -- --except python3-virt-firmware -+ --except python3-virt-firmware \ -+ --except iwl3945-firmware --except iwl4965-firmware \ -+ --except iwl100-firmware --except iwl105-firmware \ -+ --except iwl135-firmware --except iwl1000-firmware \ -+ --except iwl2000-firmware --except iwl2030-firmware \ -+ --except iwl5000-firmware --except iwl5150-firmware \ -+ --except iwl6000-firmware --except iwl6000g2a-firmware \ -+ --except iwl6000g2b-firmware --except iwl6050-firmware \ -+ --except iwl3160-firmware --except iwl7260-firmware \ -+ --except iwlax2xx-firmware - installpkg b43-openfwwf - %endif - --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 91e7400..18418cc 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.1 -Release: 4%{?dist} +Version: 39.2 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,10 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1332 -# https://pagure.io/releng/issue/11511 -# adapt to renamed iwl firmware packages -Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,14 +168,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Jul 04 2023 Adam Williamson - 39.1-4 -- Rebuilt for Python 3.12 again - -* Tue Jul 04 2023 Adam Williamson - 39.1-3 -- Backport PR #1332 to handle renamed iwl firmware packages - -* Tue Jun 13 2023 Python Maint - 39.1-2 -- Rebuilt for Python 3.12 +* Fri Jul 14 2023 Brian C. Lane 39.2-1 +- pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- tests: Fix HFS test to work with new get_file_magic output (bcl@redhat.com) +- ltmpl: Use ProcMount while running the dnf transaction (bcl@redhat.com) +- imgutils: Split part DracutChroot into ProcMount (bcl@redhat.com) +- runtime-postinstall: Remove libuser.conf (bcl@redhat.com) +- runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) +- test_minimizer: dnf5 wants --use-host-config (bcl@redhat.com) +- Install nvme-cli tool and remove machine specific nvme files (bcl@redhat.com) +- Revert "Add blacklist_exceptions to multipath.conf" (jstodola@redhat.com) * Wed May 31 2023 Brian C. Lane 39.1-1 - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) diff --git a/sources b/sources index d9ffacb..c141579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.1.tar.gz) = b077849e56bdfb5d5a5a6d2b1e5dfe22f8e1ba625ad5b8bfcadb9f918565fa4897583cf105f78005ade316e6f85efac483c36d076896e4937f5fd1ee1756fb6e +SHA512 (lorax-39.2.tar.gz) = c3dbb812b06107e26e49d1d360b3f0808f640ebbf813d4a09b9088e6a447667791b8f8c9f5131703cb6e02313a467819f57ce0ce4732e5edab1fef784dfe5121 From f6fc8022a324ea9946212bf63bdbd0fff16518c2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 14 Jul 2023 15:16:38 -0700 Subject: [PATCH 054/111] plans: prepare is reported to be unneeded and causing issues --- lorax.spec | 5 ++++- plans/build-iso.fmf | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lorax.spec b/lorax.spec index 18418cc..c1fa8e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jul 14 2023 Brian C. Lane - 39.2-2 +- plans: prepare is reported to be unneeded and causing issues + * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf index ae03eff..e3c3d28 100644 --- a/plans/build-iso.fmf +++ b/plans/build-iso.fmf @@ -1,7 +1,3 @@ summary: Run Lorax tests (build an iso, run mkksiso on it) -prepare: - how: install - package: - - lorax execute: script: ./tests/scripts/run_tests.sh From 3d87c95d48ece392472927d8e95c35c80ff126b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:03:30 +0000 Subject: [PATCH 055/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index c1fa8e9..423309a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Brian C. Lane - 39.2-2 - plans: prepare is reported to be unneeded and causing issues From ce70ae7edbe977424e187badba8b47ab47d3f0d3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Jul 2023 10:06:12 -0700 Subject: [PATCH 056/111] Backport PR #1334 to fix installer with latest librsvg2 --- ...e-install-install-rsvg-pixbuf-loader.patch | 43 +++++++++++++++++++ lorax.spec | 8 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-install-rsvg-pixbuf-loader.patch diff --git a/0001-runtime-install-install-rsvg-pixbuf-loader.patch b/0001-runtime-install-install-rsvg-pixbuf-loader.patch new file mode 100644 index 0000000..a2685d2 --- /dev/null +++ b/0001-runtime-install-install-rsvg-pixbuf-loader.patch @@ -0,0 +1,43 @@ +From c1a8a65a98eaee8543f103ad6f02435ccc3372ea Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 21 Jul 2023 15:45:50 -0700 +Subject: [PATCH] runtime-install: install rsvg-pixbuf-loader + +This was split out of librsvg2 as a subpackage recently, and +is only Recommended by the parent (not Required). For size's +sake, we don't pull Recommends into the installer env by +default. But we do really need this package, because quite a +lot of icons used in the installer are only present as SVGs in +the installer environment, so if we don't have the SVG loader we +can't show the icons. + +Right now anaconda actually crashes if the SVG renderer isn't +present, which wasn't an expected outcome, but even if the crash +is fixed, the result would be that anaconda would run but not +show a lot of icons, which obviously isn't what we want. So we +should add this regardless of a fix for the crash. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 15177467..7ceec8f8 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -105,6 +105,11 @@ installpkg kbd kbd-misc + ## required for anaconda-dracut (img-lib etc.) + installpkg tar xz curl bzip2 + ++## this is only recommended by librsvg2 since 2023-07, but in the ++## installer environment many icons used are only present as SVGs, ++## so we really need it ++installpkg rsvg-pixbuf-loader ++ + ## basic system stuff + installpkg systemd-sysv systemd-units + installpkg rsyslog +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index 423309a..dc7b019 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,9 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1334 +# Ensure we have SVG pixbuf loader now it's split out of librsvg2 +Patch0: 0001-runtime-install-install-rsvg-pixbuf-loader.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Sat Jul 22 2023 Adam Williamson - 39.2-4 +- Backport PR #1334 to fix installer with latest librsvg2 + * Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fd747053b96f391d94901a8191bccc1656f960ec Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Jul 2023 12:52:12 -0700 Subject: [PATCH 057/111] Rebuild with no changes on a side tag to resolve test problems --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index dc7b019..2e773b8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 4%{?dist} +Release: 5%{?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 +* Sat Jul 22 2023 Adam Williamson - 39.2-5 +- Rebuild with no changes on a side tag to resolve test problems + * Sat Jul 22 2023 Adam Williamson - 39.2-4 - Backport PR #1334 to fix installer with latest librsvg2 From a8825f7a07b9a5230edd2f365bce19a7bc0a68c2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 7 Aug 2023 11:34:02 -0700 Subject: [PATCH 058/111] - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - drop unneeded patch for rsvg-pixbuf-loader librsvg2 now Requires it --- .gitignore | 1 + ...e-install-install-rsvg-pixbuf-loader.patch | 43 ------------------- lorax.spec | 22 +++------- sources | 2 +- 4 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 0001-runtime-install-install-rsvg-pixbuf-loader.patch diff --git a/.gitignore b/.gitignore index e3411c8..3ec29b6 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ /lorax-39.0.tar.gz /lorax-39.1.tar.gz /lorax-39.2.tar.gz +/lorax-39.3.tar.gz diff --git a/0001-runtime-install-install-rsvg-pixbuf-loader.patch b/0001-runtime-install-install-rsvg-pixbuf-loader.patch deleted file mode 100644 index a2685d2..0000000 --- a/0001-runtime-install-install-rsvg-pixbuf-loader.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c1a8a65a98eaee8543f103ad6f02435ccc3372ea Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 21 Jul 2023 15:45:50 -0700 -Subject: [PATCH] runtime-install: install rsvg-pixbuf-loader - -This was split out of librsvg2 as a subpackage recently, and -is only Recommended by the parent (not Required). For size's -sake, we don't pull Recommends into the installer env by -default. But we do really need this package, because quite a -lot of icons used in the installer are only present as SVGs in -the installer environment, so if we don't have the SVG loader we -can't show the icons. - -Right now anaconda actually crashes if the SVG renderer isn't -present, which wasn't an expected outcome, but even if the crash -is fixed, the result would be that anaconda would run but not -show a lot of icons, which obviously isn't what we want. So we -should add this regardless of a fix for the crash. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 15177467..7ceec8f8 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -105,6 +105,11 @@ installpkg kbd kbd-misc - ## required for anaconda-dracut (img-lib etc.) - installpkg tar xz curl bzip2 - -+## this is only recommended by librsvg2 since 2023-07, but in the -+## installer environment many icons used are only present as SVGs, -+## so we really need it -+installpkg rsvg-pixbuf-loader -+ - ## basic system stuff - installpkg systemd-sysv systemd-units - installpkg rsyslog --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 2e773b8..3685147 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.2 -Release: 5%{?dist} +Version: 39.3 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,9 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1334 -# Ensure we have SVG pixbuf loader now it's split out of librsvg2 -Patch0: 0001-runtime-install-install-rsvg-pixbuf-loader.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -171,17 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Sat Jul 22 2023 Adam Williamson - 39.2-5 -- Rebuild with no changes on a side tag to resolve test problems - -* Sat Jul 22 2023 Adam Williamson - 39.2-4 -- Backport PR #1334 to fix installer with latest librsvg2 - -* Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 14 2023 Brian C. Lane - 39.2-2 -- plans: prepare is reported to be unneeded and causing issues +* Mon Aug 07 2023 Brian C. Lane 39.3-1 +- runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) +- drop unneeded patch for rsvg-pixbuf-loader + librsvg2 now Requires it * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) diff --git a/sources b/sources index c141579..1f6abb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.2.tar.gz) = c3dbb812b06107e26e49d1d360b3f0808f640ebbf813d4a09b9088e6a447667791b8f8c9f5131703cb6e02313a467819f57ce0ce4732e5edab1fef784dfe5121 +SHA512 (lorax-39.3.tar.gz) = a6b964a877175b45068cc60ef5900af04c73e8a91f14745f4248f88263196a0a35f1b7c579f929f0c75ff5e5dac07f012387f1aac2f305c386b165c86d75301b From a90f84e9728e526b4fcc7a6482a7f018c433d61b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Aug 2023 10:52:48 -0700 Subject: [PATCH 059/111] - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) - Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3ec29b6..6052f23 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /lorax-39.1.tar.gz /lorax-39.2.tar.gz /lorax-39.3.tar.gz +/lorax-39.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 3685147..bff53f5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.3 +Version: 39.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,10 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Aug 09 2023 Brian C. Lane 39.4-1 +- Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) +- Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) + * Mon Aug 07 2023 Brian C. Lane 39.3-1 - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) -- drop unneeded patch for rsvg-pixbuf-loader - librsvg2 now Requires it * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) diff --git a/sources b/sources index 1f6abb1..6b7a17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.3.tar.gz) = a6b964a877175b45068cc60ef5900af04c73e8a91f14745f4248f88263196a0a35f1b7c579f929f0c75ff5e5dac07f012387f1aac2f305c386b165c86d75301b +SHA512 (lorax-39.4.tar.gz) = 647bedf8963dff626feef56423656da4eb4249a6a46093ee88c4acfdca0a5c895d1da0248c7bb919bd0d705f9426213bbcb878d94b4b57e218b2d427a6fa194d From f767483b9eca2254d79b25f4ee4aa6b13fca8286 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 28 Aug 2023 16:47:14 -0700 Subject: [PATCH 060/111] Backport PR #1338 to cut qcom firmwares and save space --- ...only-pull-in-qcom-firmware-on-aarch6.patch | 47 +++++++++++++++++++ lorax.spec | 9 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch diff --git a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch new file mode 100644 index 0000000..39101c6 --- /dev/null +++ b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch @@ -0,0 +1,47 @@ +From ecd5934d942b36733c9dcc44d5ba98aba2a1a526 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 11 Aug 2023 09:39:20 -0700 +Subject: [PATCH] runtime-install: only pull in qcom-firmware on aarch64 + +See https://bugzilla.redhat.com/show_bug.cgi?id=2178852 . This +should save a chunk of space on the installer images for x86_64. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 0ae8bb53..93b76fb4 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -28,6 +28,8 @@ installpkg grubby + ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 + ## bfa-firmware contains only obsolete files - see + ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 ++ ## qcom-firmware we pull in again lower down but *only* on aarch64, it is ++ ## no use on other arches - https://bugzilla.redhat.com/show_bug.cgi?id=2178852 + ## various iwl package names were changed in linux-firmware-20230625-151 + ## so need to be excluded or else dnf gets sad - see + ## https://pagure.io/releng/issue/11511 . These exclusions can +@@ -53,7 +55,8 @@ installpkg grubby + --except iwlax2xx-firmware \ + --except libertas-sd8686-firmware --except libertas-sd8787-firmware \ + --except libertas-usb8388-firmware \ +- --except libertas-usb8388-olpc-firmware ++ --except libertas-usb8388-olpc-firmware \ ++ --except qcom-firmware + installpkg b43-openfwwf + %endif + +@@ -67,6 +70,7 @@ installpkg glibc-all-langpacks + installpkg grub2-tools>=${GRUB2VER} + installpkg shim-aa64 + installpkg uboot-tools ++ installpkg qcom-firmware + %endif + %if basearch == "x86_64": + installpkg grub2-tools-efi>=${GRUB2VER} +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index bff53f5..d967fcd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1338 +# https://bugzilla.redhat.com/show_bug.cgi?id=2231605 +# cut qcom firmwares from x86_64 installer images to save space +Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Aug 28 2023 Adam Williamson - 39.4-2 +- Backport PR #1338 to cut qcom firmwares and save space + * Wed Aug 09 2023 Brian C. Lane 39.4-1 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) - Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) From c2cce0630e110c06c7b4e8b4b9890c8a61e2c8a9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Sep 2023 12:18:57 -0700 Subject: [PATCH 061/111] Backport PR #1344 to pull in required filesystem packages --- ...tly-pull-in-more-filesystem-packages.patch | 38 +++++++++++++++++++ lorax.spec | 9 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Explicitly-pull-in-more-filesystem-packages.patch diff --git a/0001-Explicitly-pull-in-more-filesystem-packages.patch b/0001-Explicitly-pull-in-more-filesystem-packages.patch new file mode 100644 index 0000000..bc16f7f --- /dev/null +++ b/0001-Explicitly-pull-in-more-filesystem-packages.patch @@ -0,0 +1,38 @@ +From cce0772ac2807f85b6dbe53f5af86718cc3017e3 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 7 Sep 2023 12:04:54 -0700 +Subject: [PATCH] Explicitly pull in more filesystem packages + +Turns out we've been relying on udisks2 dependencies to pull in +several filesystem tools packages that anaconda actually needs +to create and read supported filesystems. udisks2 just changed +all those dependencies to Recommends, which don't get pulled +into the installer environment. So we need lorax to specifically +list all of these. e2fsprogs was already being pulled in through +some other dep chain, but let's explicitly list it just to make +sure we don't hit the same problem in future. From a look through +the blivet code, I don't think pulling in udftools, exfatprogs +or nilfs-utils will be useful, but we can check that with +@vojtechtrefny . + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 93b76fb4..38b1d0cd 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -118,7 +118,7 @@ installpkg systemd-sysv systemd-units + installpkg rsyslog + + ## filesystem tools +-installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs ++installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools + installpkg system-storage-manager + installpkg device-mapper-persistent-data + installpkg xfsdump +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index d967fcd..58bdea1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -18,6 +18,10 @@ Source0: %{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=2231605 # cut qcom firmwares from x86_64 installer images to save space Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch +# https://github.com/weldr/lorax/pull/1344 +# pull in filesystem tools packages we previously relied on udisks2 +# to pull in +Patch1: 0001-Explicitly-pull-in-more-filesystem-packages.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Sep 07 2023 Adam Williamson - 39.4-3 +- Backport PR #1344 to pull in required filesystem packages + * Mon Aug 28 2023 Adam Williamson - 39.4-2 - Backport PR #1338 to cut qcom firmwares and save space From d8facf9fcbdd9b92d67ad78985a2bf4ee62f9b16 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 7 Sep 2023 15:23:18 -0700 Subject: [PATCH 062/111] - Drop patches included in new upstream tar - Explicitly pull in more filesystem packages (awilliam@redhat.com) - runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) - runtime-cleanup.tmpl: fix typo 'gschadow' (chris.riches@nutanix.com) - runtime-cleanup: Change how logo pixmaps is cleaned up (bcl@redhat.com) - runtime-install: only pull in qcom-firmware on aarch64 (awilliam@redhat.com) --- .gitignore | 1 + ...tly-pull-in-more-filesystem-packages.patch | 38 --------------- ...only-pull-in-qcom-firmware-on-aarch6.patch | 47 ------------------- lorax.spec | 23 ++++----- sources | 2 +- 5 files changed, 10 insertions(+), 101 deletions(-) delete mode 100644 0001-Explicitly-pull-in-more-filesystem-packages.patch delete mode 100644 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch diff --git a/.gitignore b/.gitignore index 6052f23..7b9d25d 100644 --- a/.gitignore +++ b/.gitignore @@ -234,3 +234,4 @@ /lorax-39.2.tar.gz /lorax-39.3.tar.gz /lorax-39.4.tar.gz +/lorax-39.5.tar.gz diff --git a/0001-Explicitly-pull-in-more-filesystem-packages.patch b/0001-Explicitly-pull-in-more-filesystem-packages.patch deleted file mode 100644 index bc16f7f..0000000 --- a/0001-Explicitly-pull-in-more-filesystem-packages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cce0772ac2807f85b6dbe53f5af86718cc3017e3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 7 Sep 2023 12:04:54 -0700 -Subject: [PATCH] Explicitly pull in more filesystem packages - -Turns out we've been relying on udisks2 dependencies to pull in -several filesystem tools packages that anaconda actually needs -to create and read supported filesystems. udisks2 just changed -all those dependencies to Recommends, which don't get pulled -into the installer environment. So we need lorax to specifically -list all of these. e2fsprogs was already being pulled in through -some other dep chain, but let's explicitly list it just to make -sure we don't hit the same problem in future. From a look through -the blivet code, I don't think pulling in udftools, exfatprogs -or nilfs-utils will be useful, but we can check that with -@vojtechtrefny . - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 93b76fb4..38b1d0cd 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -118,7 +118,7 @@ installpkg systemd-sysv systemd-units - installpkg rsyslog - - ## filesystem tools --installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs -+installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools - installpkg system-storage-manager - installpkg device-mapper-persistent-data - installpkg xfsdump --- -2.41.0 - diff --git a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch deleted file mode 100644 index 39101c6..0000000 --- a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ecd5934d942b36733c9dcc44d5ba98aba2a1a526 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 11 Aug 2023 09:39:20 -0700 -Subject: [PATCH] runtime-install: only pull in qcom-firmware on aarch64 - -See https://bugzilla.redhat.com/show_bug.cgi?id=2178852 . This -should save a chunk of space on the installer images for x86_64. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 0ae8bb53..93b76fb4 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -28,6 +28,8 @@ installpkg grubby - ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - ## bfa-firmware contains only obsolete files - see - ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 -+ ## qcom-firmware we pull in again lower down but *only* on aarch64, it is -+ ## no use on other arches - https://bugzilla.redhat.com/show_bug.cgi?id=2178852 - ## various iwl package names were changed in linux-firmware-20230625-151 - ## so need to be excluded or else dnf gets sad - see - ## https://pagure.io/releng/issue/11511 . These exclusions can -@@ -53,7 +55,8 @@ installpkg grubby - --except iwlax2xx-firmware \ - --except libertas-sd8686-firmware --except libertas-sd8787-firmware \ - --except libertas-usb8388-firmware \ -- --except libertas-usb8388-olpc-firmware -+ --except libertas-usb8388-olpc-firmware \ -+ --except qcom-firmware - installpkg b43-openfwwf - %endif - -@@ -67,6 +70,7 @@ installpkg glibc-all-langpacks - installpkg grub2-tools>=${GRUB2VER} - installpkg shim-aa64 - installpkg uboot-tools -+ installpkg qcom-firmware - %endif - %if basearch == "x86_64": - installpkg grub2-tools-efi>=${GRUB2VER} --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 58bdea1..67fb437 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.4 -Release: 3%{?dist} +Version: 39.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,14 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1338 -# https://bugzilla.redhat.com/show_bug.cgi?id=2231605 -# cut qcom firmwares from x86_64 installer images to save space -Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch -# https://github.com/weldr/lorax/pull/1344 -# pull in filesystem tools packages we previously relied on udisks2 -# to pull in -Patch1: 0001-Explicitly-pull-in-more-filesystem-packages.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -176,11 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Sep 07 2023 Adam Williamson - 39.4-3 -- Backport PR #1344 to pull in required filesystem packages - -* Mon Aug 28 2023 Adam Williamson - 39.4-2 -- Backport PR #1338 to cut qcom firmwares and save space +* Thu Sep 07 2023 Brian C. Lane 39.5-1 +- Explicitly pull in more filesystem packages (awilliam@redhat.com) +- runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) +- runtime-cleanup.tmpl: fix typo 'gschadow' (chris.riches@nutanix.com) +- runtime-cleanup: Change how logo pixmaps is cleaned up (bcl@redhat.com) +- runtime-install: only pull in qcom-firmware on aarch64 (awilliam@redhat.com) * Wed Aug 09 2023 Brian C. Lane 39.4-1 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) diff --git a/sources b/sources index 6b7a17a..e867396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.4.tar.gz) = 647bedf8963dff626feef56423656da4eb4249a6a46093ee88c4acfdca0a5c895d1da0248c7bb919bd0d705f9426213bbcb878d94b4b57e218b2d427a6fa194d +SHA512 (lorax-39.5.tar.gz) = 90f18266797fa446175d2e5836126f3bd7d48f094ca0c9ee8da5cab4dbb04262a14374c5193f4b24e62731f9cd7f156c032d890ca48b30a6457c98975de9ee3b From 33a2023416abcf8cca0f2669206212504b44b6c1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 2 Oct 2023 12:15:28 -0700 Subject: [PATCH 063/111] - Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) - Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) - docs: Update the quickstart example command (vtrefny@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b9d25d..cc6241f 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,4 @@ /lorax-39.3.tar.gz /lorax-39.4.tar.gz /lorax-39.5.tar.gz +/lorax-40.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 67fb437..42b4304 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.5 +Version: 40.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Oct 02 2023 Brian C. Lane 40.0-1 +- Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) +- Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) +- docs: Update the quickstart example command (vtrefny@redhat.com) + * Thu Sep 07 2023 Brian C. Lane 39.5-1 - Explicitly pull in more filesystem packages (awilliam@redhat.com) - runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) diff --git a/sources b/sources index e867396..27ca224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.5.tar.gz) = 90f18266797fa446175d2e5836126f3bd7d48f094ca0c9ee8da5cab4dbb04262a14374c5193f4b24e62731f9cd7f156c032d890ca48b30a6457c98975de9ee3b +SHA512 (lorax-40.0.tar.gz) = 8c79702f76ccc422d3c938ac7af0471a61c2d23e4441a6f3db4f3ae5653c40aa3800442b2ced6e195396909757f82ab74880ce845b0dc8098849f1968153f24f From 4644d11f69178c00207f087c15fe9a8128849ddc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 11 Dec 2023 08:34:40 -0800 Subject: [PATCH 064/111] - ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) - test: Add pigz to test-packages (bcl@redhat.com) - dnfbase: Fix url substitution support (bcl@redhat.com) - ltmpl: Add transaction error handling (bcl@redhat.com) - test-packages: Make sure python3-libdnf5 is installed (bcl@redhat.com) - Updates for latest libdnf5 changes (bcl@redhat.com) - spec: Switch to using python3-libdnf5 (bcl@redhat.com) - Fix writing out debug info for package files and sizes (bcl@redhat.com) - libdnf5: Switch lorax to use libdnf5 (bcl@redhat.com) - Add python3-libdnf5 to the list of test packages (bcl@redhat.com) - Adjust runtime-postinstall.tmpl for systemd config files move (zbyszek@in.waw.pl) --- .gitignore | 1 + lorax.spec | 17 +++++++++++++++-- sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc6241f..fc8df17 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ /lorax-39.4.tar.gz /lorax-39.5.tar.gz /lorax-40.0.tar.gz +/lorax-40.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 42b4304..dc97093 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.0 +Version: 40.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -50,7 +50,7 @@ Requires: psmisc Requires: libselinux-python3 Requires: python3-mako Requires: python3-kickstart >= 3.19 -Requires: python3-dnf >= 3.2.0 +Requires: python3-libdnf5 Requires: python3-librepo Requires: python3-pycdio @@ -168,6 +168,19 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 11 2023 Brian C. Lane 40.1-1 +- ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) +- test: Add pigz to test-packages (bcl@redhat.com) +- dnfbase: Fix url substitution support (bcl@redhat.com) +- ltmpl: Add transaction error handling (bcl@redhat.com) +- test-packages: Make sure python3-libdnf5 is installed (bcl@redhat.com) +- Updates for latest libdnf5 changes (bcl@redhat.com) +- spec: Switch to using python3-libdnf5 (bcl@redhat.com) +- Fix writing out debug info for package files and sizes (bcl@redhat.com) +- libdnf5: Switch lorax to use libdnf5 (bcl@redhat.com) +- Add python3-libdnf5 to the list of test packages (bcl@redhat.com) +- Adjust runtime-postinstall.tmpl for systemd config files move (zbyszek@in.waw.pl) + * Mon Oct 02 2023 Brian C. Lane 40.0-1 - Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) - Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) diff --git a/sources b/sources index 27ca224..78f3270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.0.tar.gz) = 8c79702f76ccc422d3c938ac7af0471a61c2d23e4441a6f3db4f3ae5653c40aa3800442b2ced6e195396909757f82ab74880ce845b0dc8098849f1968153f24f +SHA512 (lorax-40.1.tar.gz) = c96c8b8d0752e06b327283f9c2d5e9ebc7587d60a75d7533e3f96ed38742f6e3035d0cbcf3fbd226e339d32640a01d029c0b1c059b13983c383fde65d5d40baf From 000be11ded38711c23f101c7ac40eeb8e65cd40e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 12 Dec 2023 10:58:47 -0800 Subject: [PATCH 065/111] - ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) - test-in-podman: Fix problem running in github actions (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fc8df17..eb8e631 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ /lorax-39.5.tar.gz /lorax-40.0.tar.gz /lorax-40.1.tar.gz +/lorax-40.2.tar.gz diff --git a/lorax.spec b/lorax.spec index dc97093..00594fc 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.1 +Version: 40.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 12 2023 Brian C. Lane 40.2-1 +- ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) +- test-in-podman: Fix problem running in github actions (bcl@redhat.com) + * Mon Dec 11 2023 Brian C. Lane 40.1-1 - ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) - test: Add pigz to test-packages (bcl@redhat.com) diff --git a/sources b/sources index 78f3270..d51d7d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.1.tar.gz) = c96c8b8d0752e06b327283f9c2d5e9ebc7587d60a75d7533e3f96ed38742f6e3035d0cbcf3fbd226e339d32640a01d029c0b1c059b13983c383fde65d5d40baf +SHA512 (lorax-40.2.tar.gz) = ccb91397e44c121af39e3ca483fe12ab82c337252cccdc1fb8161c1b39b97f55d7afc4339190c98003246ce7090f579e49b0aa2c344e43b7e846328ad5bf679f From 8315b760b8fd0b056c7bd1ac7054b0dd0c2f4297 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 20 Dec 2023 07:50:55 -0800 Subject: [PATCH 066/111] - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) - ltmpl: Check for errors after running the transaction (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eb8e631..a428d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -238,3 +238,4 @@ /lorax-40.0.tar.gz /lorax-40.1.tar.gz /lorax-40.2.tar.gz +/lorax-40.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 00594fc..638161d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.2 +Version: 40.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Dec 20 2023 Brian C. Lane 40.3-1 +- runtime-install: Work around problem with conflicting packages (bcl@redhat.com) +- ltmpl: Check for errors after running the transaction (bcl@redhat.com) + * Tue Dec 12 2023 Brian C. Lane 40.2-1 - ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) - test-in-podman: Fix problem running in github actions (bcl@redhat.com) diff --git a/sources b/sources index d51d7d4..3742bf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.2.tar.gz) = ccb91397e44c121af39e3ca483fe12ab82c337252cccdc1fb8161c1b39b97f55d7afc4339190c98003246ce7090f579e49b0aa2c344e43b7e846328ad5bf679f +SHA512 (lorax-40.3.tar.gz) = 169748add00cf2a4644abdf3b7157af3fbe30b0058c36b6746eb347737947e3e4faf93048a43e97c5f9c3243bb08144eb360214d36d3429d67da985df11993e8 From c16e84674fa13346bbb64fcb8b5e99cc5906e518 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:13:00 +0000 Subject: [PATCH 067/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 638161d..2f3cdf4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 20 2023 Brian C. Lane 40.3-1 - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) - ltmpl: Check for errors after running the transaction (bcl@redhat.com) From e7bb19d0c67a4d61c3d838e923d0c0b169bb07b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:44:44 +0000 Subject: [PATCH 068/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 2f3cdf4..7e7e8c2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 15237f8b2f872937ea09865f6d95055cdd35eb17 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 26 Jan 2024 11:47:29 -0800 Subject: [PATCH 069/111] Backport PR #1370 to handle wget being replaced by wget2-wget --- ...install-wget2-wget-has-replaced-wget.patch | 31 +++++++++++++++++++ lorax.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-wget2-wget-has-replaced-wget.patch diff --git a/0001-runtime-install-wget2-wget-has-replaced-wget.patch b/0001-runtime-install-wget2-wget-has-replaced-wget.patch new file mode 100644 index 0000000..ff1bc4c --- /dev/null +++ b/0001-runtime-install-wget2-wget-has-replaced-wget.patch @@ -0,0 +1,31 @@ +From 0476a77915f678846f446f819c5fec66f2997386 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 26 Jan 2024 11:19:59 -0800 +Subject: [PATCH] runtime-install: wget2-wget has replaced wget + +wget has been retired: +https://src.fedoraproject.org/rpms/wget/c/ce69c17 +in favor of wget2-wget: +https://fedoraproject.org/wiki/Changes/Wget2asWget + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index d6029830..80213366 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -184,7 +184,7 @@ installpkg python3-pyatspi + ## extra tools not required by anaconda + installpkg nano nano-default-editor + installpkg vim-minimal strace lsof dump xz less +-installpkg wget rsync bind-utils ftp mtr vconfig ++installpkg wget2-wget rsync bind-utils ftp mtr vconfig + installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils + +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index 7e7e8c2..762c1db 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1370 +# wget replaced by wget2-wget +Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jan 26 2024 Adam Williamson - 40.3-4 +- Backport PR #1370 to handle wget being replaced by wget2-wget + * Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cae9bc7940489740c7b03e52d4ec80fc721156db Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 29 Jan 2024 10:08:54 -0800 Subject: [PATCH 070/111] Backport PR #1371 to handle pcmciautils being retired --- ...ime-install-drop-retired-pcmciautils.patch | 30 +++++++++++++++++++ lorax.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-drop-retired-pcmciautils.patch diff --git a/0001-runtime-install-drop-retired-pcmciautils.patch b/0001-runtime-install-drop-retired-pcmciautils.patch new file mode 100644 index 0000000..451abbd --- /dev/null +++ b/0001-runtime-install-drop-retired-pcmciautils.patch @@ -0,0 +1,30 @@ +From de364416f3034d5e6382de5453facd0032a760c1 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 29 Jan 2024 09:41:43 -0800 +Subject: [PATCH] runtime-install: drop retired pcmciautils + +pcmciautils was just retired in Rawhide: +https://src.fedoraproject.org/rpms/pcmciautils/c/24639b0 + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index d6029830..904c42ba 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -141,9 +141,6 @@ installpkg nmap-ncat + installpkg pciutils usbutils ipmitool + installpkg mt-st smartmontools + installpkg hdparm +-%if basearch not in ("aarch64", "ppc64le", "s390x"): +-installpkg pcmciautils +-%endif + installpkg rdma-core + installpkg rng-tools + %if basearch in ("x86_64", "aarch64"): +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index 762c1db..218f053 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -18,6 +18,9 @@ Source0: %{name}-%{version}.tar.gz # https://github.com/weldr/lorax/pull/1370 # wget replaced by wget2-wget Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch +# https://github.com/weldr/lorax/pull/1371 +# pcmciautils retired +Patch: 0001-runtime-install-drop-retired-pcmciautils.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jan 29 2024 Adam Williamson - 40.3-5 +- Backport PR #1371 to handle pcmciautils being retired + * Fri Jan 26 2024 Adam Williamson - 40.3-4 - Backport PR #1370 to handle wget being replaced by wget2-wget From f383438923a98a39e5f8418e48f0ebc170c54894 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 1 Feb 2024 17:56:56 -0800 Subject: [PATCH 071/111] - Remove patches included in this release - Add testing of the new mkksiso --updates command to run_tests.sh - mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) - runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) - ltmpl: Handle installing provides with resolve_pkg_spec (bcl@redhat.com) - s390: Escape volid before using it (bcl@redhat.com) - aarch64: Escape volid before using it (bcl@redhat.com) - runtime-install: drop retired pcmciautils (awilliam@redhat.com) - runtime-install: wget2-wget has replaced wget (awilliam@redhat.com) - runtime-cleanup: anaconda's new interface needs stdbuf (kkoukiou@redhat.com) - ltmpl: Pass packages to add_rpm_install as strings (bcl@redhat.com) --- .gitignore | 1 + ...ime-install-drop-retired-pcmciautils.patch | 30 ----------------- ...install-wget2-wget-has-replaced-wget.patch | 31 ------------------ lorax.spec | 32 +++++++------------ sources | 2 +- tests/scripts/run_tests.sh | 29 +++++++++++++++-- 6 files changed, 40 insertions(+), 85 deletions(-) delete mode 100644 0001-runtime-install-drop-retired-pcmciautils.patch delete mode 100644 0001-runtime-install-wget2-wget-has-replaced-wget.patch diff --git a/.gitignore b/.gitignore index a428d6a..37948aa 100644 --- a/.gitignore +++ b/.gitignore @@ -239,3 +239,4 @@ /lorax-40.1.tar.gz /lorax-40.2.tar.gz /lorax-40.3.tar.gz +/lorax-40.4.tar.gz diff --git a/0001-runtime-install-drop-retired-pcmciautils.patch b/0001-runtime-install-drop-retired-pcmciautils.patch deleted file mode 100644 index 451abbd..0000000 --- a/0001-runtime-install-drop-retired-pcmciautils.patch +++ /dev/null @@ -1,30 +0,0 @@ -From de364416f3034d5e6382de5453facd0032a760c1 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 29 Jan 2024 09:41:43 -0800 -Subject: [PATCH] runtime-install: drop retired pcmciautils - -pcmciautils was just retired in Rawhide: -https://src.fedoraproject.org/rpms/pcmciautils/c/24639b0 - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index d6029830..904c42ba 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -141,9 +141,6 @@ installpkg nmap-ncat - installpkg pciutils usbutils ipmitool - installpkg mt-st smartmontools - installpkg hdparm --%if basearch not in ("aarch64", "ppc64le", "s390x"): --installpkg pcmciautils --%endif - installpkg rdma-core - installpkg rng-tools - %if basearch in ("x86_64", "aarch64"): --- -2.43.0 - diff --git a/0001-runtime-install-wget2-wget-has-replaced-wget.patch b/0001-runtime-install-wget2-wget-has-replaced-wget.patch deleted file mode 100644 index ff1bc4c..0000000 --- a/0001-runtime-install-wget2-wget-has-replaced-wget.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0476a77915f678846f446f819c5fec66f2997386 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 26 Jan 2024 11:19:59 -0800 -Subject: [PATCH] runtime-install: wget2-wget has replaced wget - -wget has been retired: -https://src.fedoraproject.org/rpms/wget/c/ce69c17 -in favor of wget2-wget: -https://fedoraproject.org/wiki/Changes/Wget2asWget - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index d6029830..80213366 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -184,7 +184,7 @@ installpkg python3-pyatspi - ## extra tools not required by anaconda - installpkg nano nano-default-editor - installpkg vim-minimal strace lsof dump xz less --installpkg wget rsync bind-utils ftp mtr vconfig -+installpkg wget2-wget rsync bind-utils ftp mtr vconfig - installpkg spice-vdagent - installpkg gdisk hexedit sg3_utils - --- -2.43.0 - diff --git a/lorax.spec b/lorax.spec index 218f053..ebc3119 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 40.3 -Release: 5%{?dist} +Version: 40.4 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,13 +15,6 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1370 -# wget replaced by wget2-wget -Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch -# https://github.com/weldr/lorax/pull/1371 -# pcmciautils retired -Patch: 0001-runtime-install-drop-retired-pcmciautils.patch - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -175,17 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jan 29 2024 Adam Williamson - 40.3-5 -- Backport PR #1371 to handle pcmciautils being retired - -* Fri Jan 26 2024 Adam Williamson - 40.3-4 -- Backport PR #1370 to handle wget being replaced by wget2-wget - -* Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Thu Feb 01 2024 Brian C. Lane 40.4-1 +- mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) +- runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) +- ltmpl: Handle installing provides with resolve_pkg_spec (bcl@redhat.com) +- s390: Escape volid before using it (bcl@redhat.com) +- aarch64: Escape volid before using it (bcl@redhat.com) +- runtime-install: drop retired pcmciautils (awilliam@redhat.com) +- runtime-install: wget2-wget has replaced wget (awilliam@redhat.com) +- runtime-cleanup: anaconda's new interface needs stdbuf (kkoukiou@redhat.com) +- ltmpl: Pass packages to add_rpm_install as strings (bcl@redhat.com) * Wed Dec 20 2023 Brian C. Lane 40.3-1 - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) diff --git a/sources b/sources index 3742bf5..4c280f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.3.tar.gz) = 169748add00cf2a4644abdf3b7157af3fbe30b0058c36b6746eb347737947e3e4faf93048a43e97c5f9c3243bb08144eb360214d36d3429d67da985df11993e8 +SHA512 (lorax-40.4.tar.gz) = 65ac3451123b869d649c3b788b9ec0b2560052e553c969c5228fe42969beb8685678501ce9b7df57a6263dc0f1e90fb0a69f9e689c1ea86fd7588c19a322a6e2 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 3559b7d..ce3c4ed 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -177,22 +177,42 @@ function test_two_kickstarts { status "Test two kickstart error" } - function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" } +# Test adding an updates.img file +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 + mount $OUTISO $ISODIR || exit 1 + + test_updatesimg + + status "Add updates.img" + umount_dirs +} + +function test_updatesimg { + [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso" +} + # All of the changes function run_all { running "Use all the options" - mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + 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 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options" @@ -204,13 +224,15 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso --skip-mkefiboot -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + 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 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options as a user with --skip-mkefiboot" @@ -243,6 +265,7 @@ new_volid add_files remove_quiet test_two_kickstarts +add_updatesimg run_all run_as_user From 92d48103274856fa7507175a32fe02006019fc42 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 6 Feb 2024 17:39:26 -0800 Subject: [PATCH 072/111] - New lorax documentation - 40.5 (bcl@redhat.com) - maint: Switch default platform to F40 (bcl@redhat.com) - runtime-cleanup: Update to cleanup more (akira@tagoh.org) - runtime-install: Update font packages (akira@tagoh.org) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 37948aa..1239f0f 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ /lorax-40.2.tar.gz /lorax-40.3.tar.gz /lorax-40.4.tar.gz +/lorax-40.5.tar.gz diff --git a/lorax.spec b/lorax.spec index ebc3119..ccea480 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.4 +Version: 40.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Feb 06 2024 Brian C. Lane 40.5-1 +- New lorax documentation - 40.5 (bcl@redhat.com) +- maint: Switch default platform to F40 (bcl@redhat.com) +- runtime-cleanup: Update to cleanup more (akira@tagoh.org) +- runtime-install: Update font packages (akira@tagoh.org) + * Thu Feb 01 2024 Brian C. Lane 40.4-1 - mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) - runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) diff --git a/sources b/sources index 4c280f5..d830c50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.4.tar.gz) = 65ac3451123b869d649c3b788b9ec0b2560052e553c969c5228fe42969beb8685678501ce9b7df57a6263dc0f1e90fb0a69f9e689c1ea86fd7588c19a322a6e2 +SHA512 (lorax-40.5.tar.gz) = 60c17bf48f9074b6be77424c66505de6e382d95bf6fed8dfc34847248cbf15287f240eb2dd631dded5e1b57ec71c496feca0dca86312e569c106c48219e09f3b From 8e01fdddc747ad0387b86ef0bb661a8955562a19 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 14 Feb 2024 00:05:20 -0800 Subject: [PATCH 073/111] Backport PR #1379 to fix builds when a repo uses %releasever --- ...releasever-in-the-base-object-s-vars.patch | 42 +++++++++++++++++++ lorax.spec | 9 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch diff --git a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch new file mode 100644 index 0000000..85804d2 --- /dev/null +++ b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch @@ -0,0 +1,42 @@ +From acee48ff0375416973f6f9978370ced2eb52c88e Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 13 Feb 2024 23:53:59 -0800 +Subject: [PATCH] dnf5: set releasever in the base object's vars + +With Fedora 40 now branched, openQA installer build tests started +failing with an error: + + RuntimeError: cannot open file: (2) - No such file or directory [/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-x86_64] + +it seems like setting releasever via set_substitutions just does +not fully work as expected, and libdnf goes looking for a file +with a literal `$releasever` in it based on the gpgkey line in +the repo file. Though it seems like the releasever substitution +must work to *some* extent because we at least manage to resolve +and download packages before the failure. + +This seems to fix it, anyhow, and is based on code from libdnf5 +itself in dnf5/main.cpp RootCommand::set_argument_parser() . + +Signed-off-by: Adam Williamson +--- + src/pylorax/dnfbase.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py +index 3987e4f7..e6a1c6d8 100644 +--- a/src/pylorax/dnfbase.py ++++ b/src/pylorax/dnfbase.py +@@ -153,6 +153,9 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, + log.info("Using %s for module_platform_id", platform_id) + conf.module_platform_id = platform_id + ++ # set releasever ++ dnfbase.get_vars().set("releasever", releasever) ++ + # Add .repo files + if repos: + reposdir = os.path.join(tempdir, "dnf.repos") +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index ccea480..b1f8b2c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1379 +# Fix builds when using a repo file with $releasever +Patch0: 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 14 2024 Adam Williamson - 40.5-2 +- Backport PR #1379 to fix builds when a repo uses %releasever + * Tue Feb 06 2024 Brian C. Lane 40.5-1 - New lorax documentation - 40.5 (bcl@redhat.com) - maint: Switch default platform to F40 (bcl@redhat.com) From 0fa02ec972b2b268fa59e9fe593f26998cf8141c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 19 Feb 2024 11:36:11 -0800 Subject: [PATCH 074/111] - 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) - workflows: Switch to actions/checkout@v4 (bcl@redhat.com) - dnfbase: Fix substitutions (bcl@redhat.com) --- .gitignore | 1 + ...releasever-in-the-base-object-s-vars.patch | 42 ------------------- lorax.spec | 18 ++++---- sources | 2 +- 4 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch diff --git a/.gitignore b/.gitignore index 1239f0f..9dcd8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,4 @@ /lorax-40.3.tar.gz /lorax-40.4.tar.gz /lorax-40.5.tar.gz +/lorax-40.6.tar.gz diff --git a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch deleted file mode 100644 index 85804d2..0000000 --- a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch +++ /dev/null @@ -1,42 +0,0 @@ -From acee48ff0375416973f6f9978370ced2eb52c88e Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 13 Feb 2024 23:53:59 -0800 -Subject: [PATCH] dnf5: set releasever in the base object's vars - -With Fedora 40 now branched, openQA installer build tests started -failing with an error: - - RuntimeError: cannot open file: (2) - No such file or directory [/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-x86_64] - -it seems like setting releasever via set_substitutions just does -not fully work as expected, and libdnf goes looking for a file -with a literal `$releasever` in it based on the gpgkey line in -the repo file. Though it seems like the releasever substitution -must work to *some* extent because we at least manage to resolve -and download packages before the failure. - -This seems to fix it, anyhow, and is based on code from libdnf5 -itself in dnf5/main.cpp RootCommand::set_argument_parser() . - -Signed-off-by: Adam Williamson ---- - src/pylorax/dnfbase.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py -index 3987e4f7..e6a1c6d8 100644 ---- a/src/pylorax/dnfbase.py -+++ b/src/pylorax/dnfbase.py -@@ -153,6 +153,9 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, - log.info("Using %s for module_platform_id", platform_id) - conf.module_platform_id = platform_id - -+ # set releasever -+ dnfbase.get_vars().set("releasever", releasever) -+ - # Add .repo files - if repos: - reposdir = os.path.join(tempdir, "dnf.repos") --- -2.43.0 - diff --git a/lorax.spec b/lorax.spec index b1f8b2c..3a87f04 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 40.5 -Release: 2%{?dist} +Version: 40.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,16 +15,15 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1379 -# Fix builds when using a repo file with $releasever -Patch0: 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros Requires: lorax-templates +%if 0%{?rhel} >= 9 +Requires: lorax-templates-rhel +%endif Requires: cpio Requires: device-mapper @@ -172,8 +171,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Wed Feb 14 2024 Adam Williamson - 40.5-2 -- Backport PR #1379 to fix builds when a repo uses %releasever +* 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) +- workflows: Switch to actions/checkout@v4 (bcl@redhat.com) +- dnfbase: Fix substitutions (bcl@redhat.com) * Tue Feb 06 2024 Brian C. Lane 40.5-1 - New lorax documentation - 40.5 (bcl@redhat.com) diff --git a/sources b/sources index d830c50..f5a1c9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.5.tar.gz) = 60c17bf48f9074b6be77424c66505de6e382d95bf6fed8dfc34847248cbf15287f240eb2dd631dded5e1b57ec71c496feca0dca86312e569c106c48219e09f3b +SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577 From 33f6cab8ceab1d83752aa7c1875b023b7fbfb30f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 15 Mar 2024 12:56:31 -0700 Subject: [PATCH 075/111] - maint: Switch default platform to F41 (bcl@redhat.com) - Add prefixdevname support to the boot.iso (rvykydal@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9dcd8a7..3ec552b 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-41.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 3a87f04..0f6f888 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.6 +Version: 41.0 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 Mar 15 2024 Brian C. Lane +- maint: Switch default platform to F41 (bcl@redhat.com) +- Add prefixdevname support to the boot.iso (rvykydal@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..c68dd36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577 +SHA512 (lorax-41.0.tar.gz) = 3c8d1d5a6fe3c7f288e3010006ef401172e802da883e71b55de8358a567ceb01c69c99b52fef3eadaf82640b99dba753ad3271171ae50189f8c2dd4b563bc436 From 245c76bc3498b757c3bc8e69462393a65fed3bed Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:32:43 +0200 Subject: [PATCH 076/111] Rebuilt for Python 3.13 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 0f6f888..41c9ae6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 41.0 -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 Jun 07 2024 Python Maint - 41.0-2 +- Rebuilt for Python 3.13 + * Fri Mar 15 2024 Brian C. Lane - maint: Switch default platform to F41 (bcl@redhat.com) - Add prefixdevname support to the boot.iso (rvykydal@redhat.com) From 2403d67888fa22b1170819dcbc0ef53b8aa9e40a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 13 Jun 2024 08:00:18 -0700 Subject: [PATCH 077/111] - livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) - livemedia-creator: Enable s390x virt support (bcl@redhat.com) - livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) - Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) - creator: Fix pylint error in run_creator (bcl@redhat.com) - New lorax documentation - 41.1 (bcl@redhat.com) - docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) - New lorax documentation - 41.1 (bcl@redhat.com) - spec: Switch to using the source from the github tag (bcl@redhat.com) - workflows: Add missing branch names (bcl@redhat.com) - runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) - Add a simple PR template reminder (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 35 +++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 3ec552b..073de4e 100644 --- a/.gitignore +++ b/.gitignore @@ -243,3 +243,4 @@ /lorax-40.5.tar.gz /lorax-40.6.tar.gz /lorax-41.0.tar.gz +/lorax-41.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 41c9ae6..a20573e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,19 +1,18 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} +%global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.0 -Release: 2%{?dist} +Version: 41.1 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images - License: GPL-2.0-or-later -URL: https://github.com/weldr/lorax -# To generate Source0 do: -# git clone https://github.com/weldr/lorax -# git checkout -b archive-branch lorax-%%{version}-%%{release} -# tito build --tgz -Source0: %{name}-%{version}.tar.gz + +%global tag %{version} +%forgemeta +Url: %{forgeurl} +Source0: %{forgesource} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -129,7 +128,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%forgeautosetup %build @@ -171,8 +170,20 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Jun 07 2024 Python Maint - 41.0-2 -- Rebuilt for Python 3.13 +* Wed Jun 12 2024 Brian C. Lane 41.1-1 +- livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) +- livemedia-creator: Enable s390x virt support (bcl@redhat.com) +- livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) +- Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- creator: Fix pylint error in run_creator (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- spec: Switch to using the source from the github tag (bcl@redhat.com) +- workflows: Add missing branch names (bcl@redhat.com) +- runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) +- Add a simple PR template reminder (bcl@redhat.com) * Fri Mar 15 2024 Brian C. Lane - maint: Switch default platform to F41 (bcl@redhat.com) diff --git a/sources b/sources index c68dd36..5cb2c92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.0.tar.gz) = 3c8d1d5a6fe3c7f288e3010006ef401172e802da883e71b55de8358a567ceb01c69c99b52fef3eadaf82640b99dba753ad3271171ae50189f8c2dd4b563bc436 +SHA512 (lorax-41.1.tar.gz) = 34f1005c028df131da459bcc392d11c809c56871a732c897098654304d067ca133791ded3ad9d6269bf0eb4c42adf5cc2ad32f0df2b15b24b3645928864af5db From d597f37b488e618b5f60dcf592615e1b511c1cc0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 15 Jul 2024 14:59:51 -0700 Subject: [PATCH 078/111] - Prepare for the sbin merge (zbyszek@in.waw.pl) - Add compression.erofs section to lorax.conf (bcl@redhat.com) - Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) - Replace squashfs_only with rootfs_type (bcl@redhat.com) - imgutils: Add mkerofs function and test (bcl@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) - spec: Drop forge tag lua tweak (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 073de4e..668a59a 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /lorax-40.6.tar.gz /lorax-41.0.tar.gz /lorax-41.1.tar.gz +/lorax-41.2.tar.gz diff --git a/lorax.spec b/lorax.spec index a20573e..ce4a80b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.1 +Version: 41.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -39,6 +39,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 +Requires: erofs-utils Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -170,6 +171,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jul 15 2024 Brian C. Lane 41.2-1 +- Prepare for the sbin merge (zbyszek@in.waw.pl) +- Add compression.erofs section to lorax.conf (bcl@redhat.com) +- Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) +- Replace squashfs_only with rootfs_type (bcl@redhat.com) +- imgutils: Add mkerofs function and test (bcl@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) +- spec: Drop forge tag lua tweak (bcl@redhat.com) + * Wed Jun 12 2024 Brian C. Lane 41.1-1 - livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) - livemedia-creator: Enable s390x virt support (bcl@redhat.com) diff --git a/sources b/sources index 5cb2c92..327199a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.1.tar.gz) = 34f1005c028df131da459bcc392d11c809c56871a732c897098654304d067ca133791ded3ad9d6269bf0eb4c42adf5cc2ad32f0df2b15b24b3645928864af5db +SHA512 (lorax-41.2.tar.gz) = 0c2a9ed94db90ccbc8ba3da018a3b8ef5e0ee5f1a57043d550e6c9f979a79b400966b27b90485eb8b32890c9e50b8d2e492590f735b0aba4c376b6bec578f6c9 From 25cf6c92e2e6aecbc4adfc7bbcb9070a3a31c7de Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 16 Jul 2024 16:38:57 -0700 Subject: [PATCH 079/111] - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 668a59a..24477b5 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ /lorax-41.0.tar.gz /lorax-41.1.tar.gz /lorax-41.2.tar.gz +/lorax-41.3.tar.gz diff --git a/lorax.spec b/lorax.spec index ce4a80b..2727f8c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.2 +Version: 41.3 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 +* Tue Jul 16 2024 Brian C. Lane 41.3-1 +- Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) + * Mon Jul 15 2024 Brian C. Lane 41.2-1 - Prepare for the sbin merge (zbyszek@in.waw.pl) - Add compression.erofs section to lorax.conf (bcl@redhat.com) diff --git a/sources b/sources index 327199a..dd876cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.2.tar.gz) = 0c2a9ed94db90ccbc8ba3da018a3b8ef5e0ee5f1a57043d550e6c9f979a79b400966b27b90485eb8b32890c9e50b8d2e492590f735b0aba4c376b6bec578f6c9 +SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff From 6d0236960fd360698931c8e448466cc720712c61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:59:51 +0000 Subject: [PATCH 080/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 2727f8c..1fbe0fe 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 41.3 -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 +* Thu Jul 18 2024 Fedora Release Engineering - 41.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 16 2024 Brian C. Lane 41.3-1 - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) From 5d0cac6a9d6a34c5c91bbd7d261e2a3df39a79f8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 9 Sep 2024 09:15:22 -0700 Subject: [PATCH 081/111] - 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 082/111] - 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 083/111] 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 084/111] - 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 085/111] - 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 086/111] - 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 087/111] 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 088/111] - 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 089/111] - 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 090/111] - 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 091/111] - 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 092/111] - 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 093/111] - 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 094/111] 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 095/111] - 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 096/111] - 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 097/111] - 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 098/111] - 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 099/111] - 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 100/111] 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 101/111] - 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 102/111] 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 103/111] 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 104/111] 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 105/111] 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 106/111] - 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 107/111] 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 108/111] - 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 109/111] - 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 110/111] - 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 111/111] - 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