From a0059d73b45dc913c2e874f50e50d3ddc5006f94 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 20 Feb 2023 12:13:55 -0800 Subject: [PATCH 1/7] Most of these changes were already built by adamw, this build includes them upstream. It also includes build 38.7 which was skipped because I noticed a few more things to update for the new upstream Fedora 38 branch. - New lorax documentation - 38.8 (bcl@redhat.com) - workflow: Update list of push branches for workflow tests (bcl@redhat.com) - Use Fedora 38 container for running podman tests (bcl@redhat.com) - Update default releasever and platform id for Fedora 38 (bcl@redhat.com) - 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) --- .gitignore | 1 + ...rip-gtk4-binaries-or-libtiff-2170716.patch | 42 ----- ....d-99-generic-live-Enable-automatic-.patch | 144 ------------------ 0001-Strip-some-things-from-gtk4.patch | 31 ---- lorax.spec | 41 +++-- sources | 2 +- 6 files changed, 19 insertions(+), 242 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/.gitignore b/.gitignore index b9fc9b0..27c149a 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-38.8.tar.gz 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 - diff --git a/lorax.spec b/lorax.spec index b3ac0e9..9372bd8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 38.6 -Release: 4%{?dist} +Version: 38.8 +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,22 @@ 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) +* Mon Feb 20 2023 Brian C. Lane 38.8-1 +- New lorax documentation - 38.8 (bcl@redhat.com) +- workflow: Update list of push branches for workflow tests (bcl@redhat.com) +- Use Fedora 38 container for running podman tests (bcl@redhat.com) +- Update default releasever and platform id for Fedora 38 (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..7e9e4bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2 +SHA512 (lorax-38.8.tar.gz) = f980a31dd39424e2981277b4a12f0f95efda68aa9536183eee022fd7fce2fdffe73972fd2483a147235f0d7f93799e536e91709364a63b950127ef4e86172aec From 5b281544a1d027efbc7d33490552490e9bb4e6e6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Mar 2023 11:25:58 -0700 Subject: [PATCH 2/7] - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 27c149a..f59abfc 100644 --- a/.gitignore +++ b/.gitignore @@ -230,3 +230,4 @@ /lorax-38.5.tar.gz /lorax-38.6.tar.gz /lorax-38.8.tar.gz +/lorax-38.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 9372bd8..a0f5d34 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.8 +Version: 38.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Mar 14 2023 Brian C. Lane 38.9-1 +- Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) + * Mon Feb 20 2023 Brian C. Lane 38.8-1 - New lorax documentation - 38.8 (bcl@redhat.com) - workflow: Update list of push branches for workflow tests (bcl@redhat.com) diff --git a/sources b/sources index 7e9e4bd..173a79e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.8.tar.gz) = f980a31dd39424e2981277b4a12f0f95efda68aa9536183eee022fd7fce2fdffe73972fd2483a147235f0d7f93799e536e91709364a63b950127ef4e86172aec +SHA512 (lorax-38.9.tar.gz) = 140a260d3a7b2b3a64643b4c69490f7db99f305cc2f85c7436fa60f3781a88858705020d26cd5291e4b78e64165c416756dc770978cf8711afcbc26d6dcbbd6e From f3c9b3b5b466385fcb30ef52502d836fa02a7fcb Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 27 Mar 2023 14:19:26 -0700 Subject: [PATCH 3/7] clog --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f59abfc..cf98fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ /lorax-38.6.tar.gz /lorax-38.8.tar.gz /lorax-38.9.tar.gz +/lorax-38.10.tar.gz diff --git a/lorax.spec b/lorax.spec index a0f5d34..58cc1ff 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.9 +Version: 38.10 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 27 2023 Brian C. Lane 38.10-1 +- Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) + * Tue Mar 14 2023 Brian C. Lane 38.9-1 - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) diff --git a/sources b/sources index 173a79e..a1c02bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.9.tar.gz) = 140a260d3a7b2b3a64643b4c69490f7db99f305cc2f85c7436fa60f3781a88858705020d26cd5291e4b78e64165c416756dc770978cf8711afcbc26d6dcbbd6e +SHA512 (lorax-38.10.tar.gz) = 0292e674727aebcf9876e766e237bb0ee7dcad6cf481258adf0744122b6e6959c2a4f5194c7c6ddc056ca046da67f0a9410b4c090cf50e4491476bdefce864dd From f4c1b70ef116a40e8515111303e0132e911ac8f7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 31 May 2023 13:40:04 -0700 Subject: [PATCH 4/7] Fix tmt test to use Fedora 38 repos instead of rawhide --- tests/scripts/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 3559b7d..70d37b4 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -230,7 +230,7 @@ fi # Run lorax using the host's repository configuration file if [ ! -e "$BOOTISO" ]; then running "Build boot.iso with lorax" - lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + lorax --product="Fedora" --version=38 --release=38 --volid="Fedora-38-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi From 3bab39892f39a6cbd782982d675b98ff647702aa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 13:29:47 -0700 Subject: [PATCH 5/7] 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 58cc1ff..8761d9f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.10 -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/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 - 38.10-2 +- Backport PR #1332 to handle renamed iwl firmware packages + * Mon Mar 27 2023 Brian C. Lane 38.10-1 - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) From 74a75df0b649a52e2a7ce59834bca353562946a6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 7 Aug 2023 15:05:13 -0700 Subject: [PATCH 6/7] - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) - remove included patch for renamed iwl firmware --- .gitignore | 1 + ...exclude-renamed-iwl-firmware-package.patch | 57 ------------------- lorax.spec | 14 ++--- sources | 2 +- 4 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/.gitignore b/.gitignore index cf98fa1..8d014b3 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ /lorax-38.8.tar.gz /lorax-38.9.tar.gz /lorax-38.10.tar.gz +/lorax-38.11.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 8761d9f..38918b9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 38.10 -Release: 2%{?dist} +Version: 38.11 +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,8 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Jul 04 2023 Adam Williamson - 38.10-2 -- Backport PR #1332 to handle renamed iwl firmware packages +* Mon Aug 07 2023 Brian C. Lane 38.11-1 +- runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) +- runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) +- remove included patch for renamed iwl firmware * Mon Mar 27 2023 Brian C. Lane 38.10-1 - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) diff --git a/sources b/sources index a1c02bf..d05b348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.10.tar.gz) = 0292e674727aebcf9876e766e237bb0ee7dcad6cf481258adf0744122b6e6959c2a4f5194c7c6ddc056ca046da67f0a9410b4c090cf50e4491476bdefce864dd +SHA512 (lorax-38.11.tar.gz) = d615c5e69cd52786f9299929bcc036506195726de2731fa43b4c5c007b9bb692a4f10dfb8c7deb3b7a6333bb3a06d4ae8b2ec3f09c26b260bab507e23ac67279 From cdb2169949b41d9d57d0f4e5237d9e41af71661d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Aug 2023 10:56:52 -0700 Subject: [PATCH 7/7] - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8d014b3..ed91328 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /lorax-38.9.tar.gz /lorax-38.10.tar.gz /lorax-38.11.tar.gz +/lorax-38.12.tar.gz diff --git a/lorax.spec b/lorax.spec index 38918b9..04daee5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.11 +Version: 38.12 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 38.12-1 +- Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) + * Mon Aug 07 2023 Brian C. Lane 38.11-1 - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) -- remove included patch for renamed iwl firmware * Mon Mar 27 2023 Brian C. Lane 38.10-1 - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) diff --git a/sources b/sources index d05b348..d02da4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.11.tar.gz) = d615c5e69cd52786f9299929bcc036506195726de2731fa43b4c5c007b9bb692a4f10dfb8c7deb3b7a6333bb3a06d4ae8b2ec3f09c26b260bab507e23ac67279 +SHA512 (lorax-38.12.tar.gz) = 07efb664dc4dc56b417aad9aa1f69cf9b4eeef29e72628ffeb80977602cf630e4361b914a5203a24c6abb8cecec9572f479c6ed28b9d9f25b5c2d765af5cdf3b