up to 047

- updated patches (plymouth-logo patch no longer necessary)
- added explicit, versioned kmod runtime dep

diff --git a/dracut.spec b/dracut.spec
index 4d11db9510ecb8f0096ac41bd1407dc0c61a8998..d7f9703b9cfcb22500efd15b817ea5c43f43219f 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,26 +1,25 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       046
-Release:       3
+Version:       047
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 224b67e9bc079e013541a74e85659188
+# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a
 Source1:       pld.conf
-Patch1:                plymouth-libdir.patch
-Patch2:                os-release.patch
-Patch3:                plymouth-logo.patch
-Patch4:                arch-libdir.patch
-Patch5:                systemd-paths.patch
-Patch6:                prelink-libs.patch
-Patch7:                cryptsetup.patch
+Patch0:                plymouth-libdir.patch
+Patch1:                os-release.patch
+Patch2:                arch-libdir.patch
+Patch3:                systemd-paths.patch
+Patch4:                prelink-libs.patch
+Patch5:                cryptsetup.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
-BuildRequires: kmod-devel >= 15
+BuildRequires: kmod-devel >= 23
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 Requires:      bash
@@ -32,6 +31,7 @@ Requires:     glibc-misc
 Requires:      grep
 Requires:      gzip
 Requires:      hardlink
+Requires:      kmod >= 23
 Requires:      sed
 Requires:      systemd-units
 Requires:      udev
@@ -192,13 +192,12 @@ Bashowe dopełnianie składni dla polecenia dracut.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -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
@@ -267,8 +266,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
 %dir %{dracutlibdir}/modules.d/00systemd
 %attr(755,root,root) %{dracutlibdir}/modules.d/00systemd/module-setup.sh
-%dir %{dracutlibdir}/modules.d/00systemd-bootchart
-%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/01systemd-initrd
 %attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-initrd/module-setup.sh
 %dir %{dracutlibdir}/modules.d/03modsign
@@ -294,13 +291,13 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
 %dir %{dracutlibdir}/modules.d/90crypt
 %attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh
-%dir %{dracutlibdir}/modules.d/91crypt-loop
-%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
 %dir %{dracutlibdir}/modules.d/90dm
 %{dracutlibdir}/modules.d/90dm/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh
@@ -330,8 +327,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-gpg/README
 %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
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
+%dir %{dracutlibdir}/modules.d/95lunmask
+%attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block
@@ -408,6 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
+%{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.modules.7*
@@ -421,7 +427,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut-pre-udev.service.8*
 %{_mandir}/man8/dracut-shutdown.service.8*
 %{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man7/dracut.bootup.7.gz
 
 #/usr/lib/kernel/install.d/50-dracut.install
 #/usr/lib/kernel/install.d/51-dracut-rescue.install

diff --git a/os-release.patch b/os-release.patch
index 8650197689cf1bae128562125af1400be24300cd..6ff204d47661d142936bbf5c6a861dab5d10f5e5 100644 (file)
--- a/os-release.patch
+++ b/os-release.patch
@@ -1,11 +1,11 @@
---- dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh~       2012-04-05 13:54:38.000000000 +0200
-+++ dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh        2012-04-27 13:04:05.676319178 +0200
-@@ -7,7 +7,7 @@
- inst /sbin/plymouthd /bin/plymouthd
- dracut_install /bin/plymouth \
-     "${PLYMOUTH_LOGO_FILE}" \
+--- dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh.orig   2018-02-19 19:30:07.910250308 +0100
++++ dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh        2018-02-19 19:31:04.133205683 +0100
+@@ -4,7 +4,7 @@
+ PLYMOUTH_THEME=$(plymouth-set-default-theme)
+ 
+ inst_multiple plymouthd plymouth \
 -    /etc/system-release
 +    /etc/os-release
  
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
+ test -e "${PLYMOUTH_LOGO_FILE}" && inst_simple "${PLYMOUTH_LOGO_FILE}"
  

diff --git a/plymouth-libdir.patch b/plymouth-libdir.patch
index dbec4ac21482b4a6744ba51f7b622832a5437ac3..5542fe2fa1a78e21a8215ad64362640245a15545 100644 (file)
--- a/plymouth-libdir.patch
+++ b/plymouth-libdir.patch
@@ -1,12 +1,11 @@
-diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh
---- dracut-040.orig/modules.d/50plymouth/module-setup.sh       2014-10-24 17:41:12.966283303 +0200
-+++ dracut-040/modules.d/50plymouth/module-setup.sh    2014-10-24 17:42:58.112954942 +0200
-@@ -13,7 +13,7 @@
+--- dracut-047/modules.d/50plymouth/module-setup.sh.orig       2018-02-19 19:28:23.170948639 +0100
++++ dracut-047/modules.d/50plymouth/module-setup.sh    2018-02-19 19:29:29.467174216 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/bash
  
- # called by dracut
- install() {
--    PKGLIBDIR="/usr/lib/plymouth"
-+    PKGLIBDIR="/usr/@lib@/plymouth"
+ pkglib_dir() {
+-    local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
++    local _dirs="/usr/@lib@/plymouth /usr/libexec/plymouth/"
      if type -P dpkg-architecture &>/dev/null; then
-         PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
+         _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
      fi

diff --git a/plymouth-logo.patch b/plymouth-logo.patch
deleted file mode 100644 (file)
index 148428c..0000000
--- a/plymouth-logo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh.orig   2013-08-26 21:31:12.615640993 +0200
-+++ dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh        2013-08-27 15:35:36.416243854 +0200
-@@ -5,9 +5,10 @@
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
- 
- inst_multiple plymouthd plymouth \
--    "${PLYMOUTH_LOGO_FILE}" \
-     /etc/os-release
- 
-+[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && inst_multiple "${PLYMOUTH_LOGO_FILE}"
-+
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
- 
- inst_libdir_file "plymouth/text.so" "plymouth/details.so"

diff --git a/systemd-paths.patch b/systemd-paths.patch
index d7e316ff33ca92912a5d57842dab8cdaebf6571f..012c6651e39220c96aca649aad1c8b5404eb9fb9 100644 (file)
--- a/systemd-paths.patch
+++ b/systemd-paths.patch
@@ -1,11 +1,11 @@
---- dracut-043/modules.d/98dracut-systemd/emergency.service.wiget      2013-03-27 23:05:57.984373121 +0100
-+++ dracut-043/modules.d/98dracut-systemd/emergency.service    2013-03-27 23:11:39.569991251 +0100
-@@ -17,7 +17,7 @@ Wants=systemd-vconsole-setup.service
- Environment=HOME=/
+--- dracut-047/modules.d/98dracut-systemd/emergency.service.orig       2018-02-19 19:33:03.992393899 +0100
++++ dracut-047/modules.d/98dracut-systemd/emergency.service    2018-02-19 19:34:10.421940966 +0100
+@@ -16,7 +16,7 @@
+ Environment=NEWROOT=/sysroot
  WorkingDirectory=/
  ExecStart=/bin/dracut-emergency
 -ExecStopPost=-/usr/bin/systemctl --fail --no-block default
 +ExecStopPost=-/bin/systemctl --fail --no-block default
- Type=oneshot
+ Type=idle
  StandardInput=tty-force
  StandardOutput=inherit