From 216cf5e5f1b2a119792d89b2c2754ddf292a3f34 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 19 Aug 2017 11:11:26 +0100
Subject: sys-kernel/dracut-config-redcore : new package (split dracut redcore
 configuration in a separate package)

---
 .../dracut-config-redcore-1708.ebuild              | 30 ++++++++++++++++++++++
 .../files/redcore-dracut.conf                      | 11 ++++++++
 sys-kernel/dracut/dracut-044-r1708.ebuild          | 10 +++++---
 sys-kernel/dracut/files/redcore-dracut.conf        | 11 --------
 sys-kernel/dracut/metadata.xml                     | 24 -----------------
 5 files changed, 47 insertions(+), 39 deletions(-)
 create mode 100644 sys-kernel/dracut-config-redcore/dracut-config-redcore-1708.ebuild
 create mode 100644 sys-kernel/dracut-config-redcore/files/redcore-dracut.conf
 delete mode 100644 sys-kernel/dracut/files/redcore-dracut.conf
 delete mode 100644 sys-kernel/dracut/metadata.xml

diff --git a/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708.ebuild b/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708.ebuild
new file mode 100644
index 00000000..6a443c35
--- /dev/null
+++ b/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Redcore Linux GRUB configuration files"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="sys-boot/grub"
+
+S="${FILESDIR}"
+
+src_install() {
+	dodir "/etc/dracut.conf.d" || die
+	insinto "/etc/dracut.conf.d" || die
+	doins -r "${S}/"* || die
+}
+
+pkg_preinst() {
+	if [[ -f ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ]]; then
+		mv ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf.backup"
+	fi
+}
diff --git a/sys-kernel/dracut-config-redcore/files/redcore-dracut.conf b/sys-kernel/dracut-config-redcore/files/redcore-dracut.conf
new file mode 100644
index 00000000..7e1c53db
--- /dev/null
+++ b/sys-kernel/dracut-config-redcore/files/redcore-dracut.conf
@@ -0,0 +1,11 @@
+# Host-Only mode: Install only what is needed for booting the local host instead of a generic host and generate host-specific configuration. 
+hostonly="yes"
+
+# Combine early microcode with ramdisk. Uncomment the line bellow, and run "dracut -f" if you want early microcode update.
+early_microcode="yes"
+
+# Dracut modules to add when building the iniframfs
+add_dracutmodules+=" drm "
+
+# Dracut modules to ommit when building the initramfs.
+omit_dracutmodules+=" plymouth systemd systemd-initrd systemd-networkd dracut-systemd "
diff --git a/sys-kernel/dracut/dracut-044-r1708.ebuild b/sys-kernel/dracut/dracut-044-r1708.ebuild
index 8f5a61e2..e242b33d 100644
--- a/sys-kernel/dracut/dracut-044-r1708.ebuild
+++ b/sys-kernel/dracut/dracut-044-r1708.ebuild
@@ -12,12 +12,17 @@ SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug selinux systemd"
+IUSE="debug selinux systemd +microcode"
 
 RESTRICT="test"
 
 CDEPEND="virtual/udev
 	systemd? ( >=sys-apps/systemd-199 )
+	microcode? (
+		sys-firmware/intel-microcode
+		sys-kernel/linux-firmware
+	)
+	sys-kernel/dracut-config-redcore
 	"
 RDEPEND="${CDEPEND}
 	app-arch/cpio
@@ -156,9 +161,6 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins dracut.logrotate dracut
 	
-	insinto /etc/dracut.conf.d
-	doins "${FILESDIR}"/redcore-dracut.conf
-	
 	dodir /var/lib/dracut/overlay
 
 	dohtml dracut.html
diff --git a/sys-kernel/dracut/files/redcore-dracut.conf b/sys-kernel/dracut/files/redcore-dracut.conf
deleted file mode 100644
index b3a3fa86..00000000
--- a/sys-kernel/dracut/files/redcore-dracut.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Host-Only mode: Install only what is needed for booting the local host instead of a generic host and generate host-specific configuration. 
-hostonly="yes"
-
-# Combine early microcode with ramdisk. Uncomment the line bellow, and run "dracut -f" if you want early microcode update.
-# early_microcode="yes"
-
-# Dracut modules to add when building the iniframfs
-add_dracutmodules+=" drm "
-
-# Dracut modules to ommit when building the initramfs.
-omit_dracutmodules+=" plymouth systemd systemd-initrd systemd-networkd dracut-systemd "
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
deleted file mode 100644
index bc57bc2d..00000000
--- a/sys-kernel/dracut/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexander@tsoy.me</email>
-		<name>Alexander Tsoy</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-		<name>Amadeusz Żołnowski</name>
-	</maintainer>
-	<use>
-		<flag name="debug">Module installing additional tools like strace, file
-			editor, ssh and more</flag>
-	</use>
-	<longdescription lang="en">
-	Generic, modular initramfs generation tool that can be used across various
-	distributions.
-	</longdescription>
-</pkgmetadata>
-- 
cgit v1.2.3