- bash 5 fixes

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 1e73810ef02a5f659e06e3a21ff6fd2402ff63cc..1b173c2b4905d77fc2c1260756b75a0bb461135e 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,7 +2,7 @@ Summary:        Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       048
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -16,8 +16,9 @@ Patch4:               compressors.patch
 Patch5:                proc_sys_remount.patch
 Patch6:                misc_fixes.patch
 Patch7:                initrd-release.patch
-Patch8:                no_systemd_udevd.patch
-Patch9:                crypttab-keyscript.patch
+Patch8:                crypttab-keyscript.patch
+Patch9:                bash-5.patch
+Patch100:      no_systemd.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -187,6 +188,8 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch8 -p1
 %patch9 -p1
 
+%patch100 -p1
+
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 find modules.d -name '*.orig' | xargs -r %{__rm}
@@ -224,11 +227,16 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 # SuSE specific man page
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd-suse.8
 
-# remove systemd stuff
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+# remove systemd and related stuff
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,80lvmmerge,98dracut-systemd}
 %{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@,90stratis/stratisd-init}.service
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
+# remove other, uncesessary stuff
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91zipl
+%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/50-dracut.install
+%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/51-dracut-rescue.install
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -279,9 +287,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
-%dir %{dracutlibdir}/modules.d/80lvmmerge
-%{dracutlibdir}/modules.d/80lvmmerge/README.md
-%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh
 %dir %{dracutlibdir}/modules.d/81cio_ignore
 %attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
@@ -318,8 +323,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-loop
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
-%dir %{dracutlibdir}/modules.d/91zipl
-%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
 %dir %{dracutlibdir}/modules.d/95dcssblk
 %attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
@@ -402,9 +405,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/mkinitrd.8*
 
-#/usr/lib/kernel/install.d/50-dracut.install
-#/usr/lib/kernel/install.d/51-dracut-rescue.install
-
 %files network
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/40network