From 29bf54b82907bd2bdb6630a655fe3a5e548ce6c7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 18:42:57 -0800 Subject: [PATCH] Don't cleanup report-cli and fix text mode crash reporting --- ...don-t-wipe-usr-bin-report-cli-193755.patch | 27 +++++++++++++++++++ lorax.spec | 11 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch diff --git a/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch b/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch new file mode 100644 index 0000000..d5a0c5c --- /dev/null +++ b/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch @@ -0,0 +1,27 @@ +From b9fa8ad1eb45c7df04c72dcf8585c3e79fa14303 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 10 Mar 2021 17:20:00 -0800 +Subject: [PATCH] runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) + +We need it for reporting things! + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 17ce1648..724c4592 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -282,7 +282,6 @@ removefrom psmisc /usr/share/locale/* + removefrom python3-kickstart /usr/lib/python*/site-packages/pykickstart/locale/* + removefrom readline /usr/${libdir}/libhistory* + removefrom libreport /usr/share/locale/* +-removefrom libreport-cli /usr/bin/* + removefrom rdma-core /etc/rdma/mlx4.conf + removefrom rpm /usr/bin/* /usr/share/locale/* + removefrom rsync /etc/* +-- +2.30.1 + diff --git a/lorax.spec b/lorax.spec index 18fd37d..d2d997b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz Patch0: xorg-x11-server-utils-retire.patch +# runtime-cleanup: don't wipe report-cli, we need it to report crashes +# https://bugzilla.redhat.com/show_bug.cgi?id=1937550 +# https://github.com/weldr/lorax/pull/1121 +Patch1: 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch BuildRequires: python3-devel BuildRequires: make @@ -148,6 +152,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -195,6 +200,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Mar 10 2021 Adam Williamson - 35.0-3 +- Backport patch to not cleanup report-cli and fix text mode crash reporting + Resolves: rhbz#1937550 + * Fri Mar 05 2021 Kevin Fenzi - 35.0-2 - Add patch downstream to replace retired/blocked xorg-x11-server-utils package