Don't remove kernel/install.d scripts if systemd is enabled. Fix bug #544558.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

6 files changed, 20 insertions, 31 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index e10207c4c106..b843c9407669 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.187 2015/03/24 13:12:00 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.188 2015/03/28 14:08:04 aidecoe Exp $
+
+*dracut-041-r2 (28 Mar 2015)
+
+  28 Mar 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-041-r1.ebuild,
+  +dracut-041-r2.ebuild,
+  -files/041-r1-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch,
+  +files/041-r2-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch,
+  -files/041-r1-0002-Install-dracut-install-and-skipcpio-in.patch,
+  +files/041-r2-0002-Install-dracut-install-and-skipcpio-in.patch,
+  -files/041-r1-0003-Take-into-account-lib64-dirs-when-dete.patch,
+  +files/041-r2-0003-Take-into-account-lib64-dirs-when-dete.patch,
+  -files/041-r1-0004-Don-t-install-scripts-in-kernel-instal.patch:
+  Don't remove kernel/install.d scripts if systemd is enabled. Fix bug #544558.
 
 *dracut-041-r1 (24 Mar 2015)
 
diff --git a/sys-kernel/dracut/dracut-041-r1.ebuild b/sys-kernel/dracut/dracut-041-r2.ebuild
index 5ed7581e3c54..99b037d1534d 100644
--- a/sys-kernel/dracut/dracut-041-r1.ebuild
+++ b/sys-kernel/dracut/dracut-041-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-041-r1.ebuild,v 1.1 2015/03/24 13:12:00 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-041-r2.ebuild,v 1.1 2015/03/28 14:08:04 aidecoe Exp $
 
 EAPI=4
 
@@ -52,7 +52,6 @@ PATCHES=(
 	"${FILESDIR}/${PVR}-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch"
 	"${FILESDIR}/${PVR}-0002-Install-dracut-install-and-skipcpio-in.patch"
 	"${FILESDIR}/${PVR}-0003-Take-into-account-lib64-dirs-when-dete.patch"
-	"${FILESDIR}/${PVR}-0004-Don-t-install-scripts-in-kernel-instal.patch"
 	)
 QA_MULTILIB_PATHS="
 	usr/lib/dracut/dracut-install
@@ -175,6 +174,11 @@ src_install() {
 
 	dohtml dracut.html
 
+	if ! use systemd; then
+		# Scripts in kernel/install.d are systemd-specific
+		rm -r "${D%/}/${my_libdir}/kernel" || die
+	fi
+
 	#
 	# Modules
 	#
diff --git a/sys-kernel/dracut/files/041-r1-0004-Don-t-install-scripts-in-kernel-instal.patch b/sys-kernel/dracut/files/041-r1-0004-Don-t-install-scripts-in-kernel-instal.patch
deleted file mode 100644
index 84c7f22740ad..000000000000
--- a/sys-kernel/dracut/files/041-r1-0004-Don-t-install-scripts-in-kernel-instal.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6b1ed1bcc4df213f9bf7ffbc5a7586e7d5b26206 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 23 Mar 2015 21:58:28 +0100
-Subject: [PATCH 4/4] Don't install scripts in kernel/install.d
-
-Scripts installed kernel/install.d have no use in Gentoo.  It is
-probably a RH specific thing.
----
- Makefile | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bb007d1..b150491 100644
---- a/Makefile
-+++ b/Makefile
-@@ -155,9 +155,6 @@ endif
- 		mkdir -p $(DESTDIR)$(libexecdir)/dracut; \
- 		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(libexecdir)/dracut/skipcpio; \
- 	fi
--	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
--	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
--	install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
- 	mkdir -p $(DESTDIR)${bashcompletiondir}
- 	install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
- 	install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
--- 
-2.3.3
-
diff --git a/sys-kernel/dracut/files/041-r1-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/041-r2-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch
index d16119ccaea7..d16119ccaea7 100644
--- a/sys-kernel/dracut/files/041-r1-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch
+++ b/sys-kernel/dracut/files/041-r2-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch
diff --git a/sys-kernel/dracut/files/041-r1-0002-Install-dracut-install-and-skipcpio-in.patch b/sys-kernel/dracut/files/041-r2-0002-Install-dracut-install-and-skipcpio-in.patch
index 5202ac37401a..5202ac37401a 100644
--- a/sys-kernel/dracut/files/041-r1-0002-Install-dracut-install-and-skipcpio-in.patch
+++ b/sys-kernel/dracut/files/041-r2-0002-Install-dracut-install-and-skipcpio-in.patch
diff --git a/sys-kernel/dracut/files/041-r1-0003-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/041-r2-0003-Take-into-account-lib64-dirs-when-dete.patch
index b355f8445c69..b355f8445c69 100644
--- a/sys-kernel/dracut/files/041-r1-0003-Take-into-account-lib64-dirs-when-dete.patch
+++ b/sys-kernel/dracut/files/041-r2-0003-Take-into-account-lib64-dirs-when-dete.patch