Compare commits

...

7 Commits
rawhide ... f38

Author SHA1 Message Date
Brian C. Lane cdb2169949 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) 2023-08-09 10:56:52 -07:00
Brian C. Lane 74a75df0b6 - 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
2023-08-07 15:05:13 -07:00
Adam Williamson 3bab39892f Backport PR #1332 to handle renamed iwl firmware packages 2023-07-04 13:29:47 -07:00
Brian C. Lane f4c1b70ef1 Fix tmt test to use Fedora 38 repos instead of rawhide 2023-05-31 13:40:04 -07:00
Brian C. Lane f3c9b3b5b4 clog 2023-03-27 14:19:26 -07:00
Brian C. Lane 5b281544a1 - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) 2023-03-14 11:25:58 -07:00
Brian C. Lane a0059d73b4 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)
2023-02-20 12:13:55 -08:00
7 changed files with 36 additions and 242 deletions

5
.gitignore vendored
View File

@ -229,3 +229,8 @@
/lorax-38.4.tar.gz
/lorax-38.5.tar.gz
/lorax-38.6.tar.gz
/lorax-38.8.tar.gz
/lorax-38.9.tar.gz
/lorax-38.10.tar.gz
/lorax-38.11.tar.gz
/lorax-38.12.tar.gz

View File

@ -1,42 +0,0 @@
From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
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 <awilliam@redhat.com>
---
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

View File

@ -1,144 +0,0 @@
From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
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

View File

@ -1,31 +0,0 @@
From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
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 <awilliam@redhat.com>
---
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

View File

@ -3,8 +3,8 @@
%define debug_package %{nil}
Name: lorax
Version: 38.6
Release: 4%{?dist}
Version: 38.12
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,35 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/*
%changelog
* Fri Feb 17 2023 Adam Williamson <awilliam@redhat.com> - 38.6-4
- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716)
* Wed Aug 09 2023 Brian C. Lane <bcl@redhat.com> 38.12-1
- Exclude more obsoleted libertas firmware packages (awilliam@redhat.com)
* Thu Feb 16 2023 Adam Williamson <awilliam@redhat.com> - 38.6-3
- Backport PR #1310 to disable persistence again, it's busted (#2170544)
* Mon Aug 07 2023 Brian C. Lane <bcl@redhat.com> 38.11-1
- runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com)
- runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com)
* Wed Feb 15 2023 Adam Williamson <awilliam@redhat.com> - 38.6-2
- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose
* Mon Mar 27 2023 Brian C. Lane <bcl@redhat.com> 38.10-1
- Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com)
* Tue Mar 14 2023 Brian C. Lane <bcl@redhat.com> 38.9-1
- Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com)
* Mon Feb 20 2023 Brian C. Lane <bcl@redhat.com> 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)
* Mon Feb 20 2023 Brian C. Lane <bcl@redhat.com> 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 <bcl@redhat.com> 38.6-1
- templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org)

View File

@ -1 +1 @@
SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2
SHA512 (lorax-38.12.tar.gz) = 07efb664dc4dc56b417aad9aa1f69cf9b4eeef29e72628ffeb80977602cf630e4361b914a5203a24c6abb8cecec9572f479c6ed28b9d9f25b5c2d765af5cdf3b

View File

@ -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