Add downstream patch to not try and install retired resierfs-utils package

This commit is contained in:
Kevin Fenzi 2021-04-01 18:06:39 -07:00
parent 29bf54b829
commit 4ffefc09f4
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl
--- lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl 2021-04-01 17:57:17.526337827 -0700
+++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-04-01 17:57:58.961412923 -0700
@@ -96,7 +96,7 @@
installpkg librsvg2
## filesystem tools
-installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs
+installpkg btrfs-progs jfsutils xfsprogs gfs2-utils ntfs-3g ntfsprogs
installpkg system-storage-manager
installpkg device-mapper-persistent-data
installpkg xfsdump

View File

@ -4,7 +4,7 @@
Name: lorax
Version: 35.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Tool for creating the anaconda install images
License: GPLv2+
@ -19,6 +19,8 @@ Patch0: xorg-x11-server-utils-retire.patch
# 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
# reiserfs-utils has been retired in fedora, so don't try and install it anymore.
Patch2: lorax-35.0-drop-reiserfs.patch
BuildRequires: python3-devel
BuildRequires: make
@ -200,6 +202,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_mandir}/man1/composer-cli.1*
%changelog
* Thu Apr 01 2021 Kevin Fenzi <kevin@scrye.com> - 35.0-4
- Add downstream patch to not try and install retired resierfs-utils package
* Wed Mar 10 2021 Adam Williamson <awilliam@redhat.com> - 35.0-3
- Backport patch to not cleanup report-cli and fix text mode crash reporting
Resolves: rhbz#1937550