From 828b0b0c5b365ce15ef3cef68df75df974b3b900 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 10 Nov 2021 16:15:10 -0800 Subject: [PATCH 1/4] - 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 cebf7105901e77f04ab9ee565b75300e48a013e6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 11 Nov 2021 10:18:50 -0800 Subject: [PATCH 2/4] 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 8a6043dbac132b299f2e85aa94bb0447605c737b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Dec 2021 13:53:20 -0800 Subject: [PATCH 3/4] - 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 4/4] 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)