Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716)

This commit is contained in:
Adam Williamson 2023-02-17 18:16:58 -08:00
parent c00cc2a98b
commit e0d8f46b08
2 changed files with 54 additions and 3 deletions

View File

@ -0,0 +1,42 @@
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

@ -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 <awilliam@redhat.com> - 38.6-4
- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716)
* Thu Feb 16 2023 Adam Williamson <awilliam@redhat.com> - 38.6-3
- Backport PR #1310 to disable persistence again, it's busted (#2170544)