From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 19 Jun 2013 06:30:43 +0000 (+0200)
Subject: - when installing prelink binary pull also all libs it's linked to
X-Git-Tag: auto/th/dracut-029-2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=3f2201f68be539dbb5bc9c318b3ca5d1919047d0;hp=0a41c745a1aae58ec030bb7d7bc6ab9f393fc840;p=packages%2Fdracut.git

- when installing prelink binary pull also all libs it's linked to
- rel 2
---

diff --git a/dracut.spec b/dracut.spec
index 2b441a2..14b0be2 100644
--- 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:	029
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Base
 Source0:	http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -14,6 +14,7 @@ Patch2:		os-release.patch
 Patch3:		plymouth-logo.patch
 Patch4:		arch-libdir.patch
 Patch5:		systemd-paths.patch
+Patch6:		prelink-libs.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
@@ -194,6 +195,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -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
diff --git a/prelink-libs.patch b/prelink-libs.patch
new file mode 100644
index 0000000..b9de35f
--- /dev/null
+++ b/prelink-libs.patch
@@ -0,0 +1,15 @@
+--- dracut-029/dracut.sh~	2013-06-14 15:31:28.000000000 +0200
++++ dracut-029/dracut.sh	2013-06-19 08:29:40.828089414 +0200
+@@ -1148,10 +1148,10 @@
+ if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
+     if [[ $DRACUT_FIPS_MODE ]]; then
+         dinfo "*** Installing prelink files ***"
+-        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
++        dracut_install -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+     else
+         dinfo "*** Pre-linking files ***"
+-        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
++        dracut_install -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.*