[packages/dracut] - updated to 034 - updated prelink-libs patch

qboosh qboosh at pld-linux.org
Sun Oct 20 14:48:14 CEST 2013


commit f1b08f9e66576ca74808cdc05358722805f252e5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 20 14:47:40 2013 +0200

    - updated to 034
    - updated prelink-libs patch

 dracut.spec        |  6 ++----
 prelink-libs.patch | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index 92d7234..b9abbe1 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	033
+Version:	034
 Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	de9e2089909f6d7b147ada7685b3e0dd
+# Source0-md5:	8afdca5b30b98ae8ce603fbb7894068e
 Source1:	pld.conf
 Patch1:		plymouth-libexec.patch
 Patch2:		os-release.patch
@@ -279,8 +279,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/90bcache
-%attr(755,root,root) %{dracutlibdir}/modules.d/90bcache/module-setup.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
diff --git a/prelink-libs.patch b/prelink-libs.patch
index 486e5f7..0645766 100644
--- a/prelink-libs.patch
+++ b/prelink-libs.patch
@@ -1,15 +1,15 @@
---- dracut-032/dracut.sh.orig	2013-08-27 15:36:03.692909358 +0200
-+++ dracut-032/dracut.sh	2013-08-27 15:39:08.759568281 +0200
-@@ -1234,10 +1234,10 @@
- if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
-     if [[ $DRACUT_FIPS_MODE ]]; then
-         dinfo "*** Installing prelink files ***"
--        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-+        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-     else
-         dinfo "*** Pre-linking files ***"
--        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-+        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-         chroot "$initdir" "$PRELINK_BIN" -a
-         rm -f -- "$initdir/$PRELINK_BIN"
-         rm -fr -- "$initdir"/etc/prelink.*
+--- dracut-034/dracut.sh.orig	2013-10-20 14:13:51.740264092 +0200
++++ dracut-034/dracut.sh	2013-10-20 14:29:50.300223867 +0200
+@@ -1266,10 +1266,10 @@
+     if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
+         if [[ $DRACUT_FIPS_MODE ]]; then
+             dinfo "*** Installing prelink files ***"
+-            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
++            inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+         else
+             dinfo "*** Pre-linking files ***"
+-            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
++            inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
+             chroot "$initdir" "$PRELINK_BIN" -a
+             rm -f -- "$initdir/$PRELINK_BIN"
+             rm -fr -- "$initdir"/etc/prelink.*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/f1b08f9e66576ca74808cdc05358722805f252e5



More information about the pld-cvs-commit mailing list