From dbf24e14c87f953aa3d18d000c376dd55b454962 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 22 Dec 2017 20:45:31 +0000
Subject: sys-kernel/genkernel-next : revision bump (do not force firmware
 install)

---
 .../genkernel-next-63-skip-firmware-install.patch  | 17 ++++++
 .../genkernel-next/genkernel-next-63-r1.ebuild     | 64 ++++++++++++++++++++++
 sys-kernel/genkernel-next/genkernel-next-63.ebuild | 63 ---------------------
 sys-kernel/genkernel-next/metadata.xml             | 15 -----
 4 files changed, 81 insertions(+), 78 deletions(-)
 create mode 100644 sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch
 create mode 100644 sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild
 delete mode 100644 sys-kernel/genkernel-next/genkernel-next-63.ebuild
 delete mode 100644 sys-kernel/genkernel-next/metadata.xml

(limited to 'sys-kernel/genkernel-next')

diff --git a/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch b/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch
new file mode 100644
index 00000000..8426c739
--- /dev/null
+++ b/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch
@@ -0,0 +1,17 @@
+diff -Nur a/gen_compile.sh b/gen_compile.sh
+--- a/gen_compile.sh	2015-02-16 10:03:04.000000000 +0000
++++ b/gen_compile.sh	2017-12-22 20:42:03.648220913 +0000
+@@ -293,10 +293,9 @@
+     local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_OUTPUTDIR}"/.config`
+     if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ]
+     then
+-        print_info 1 "        >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
+-        MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
+-    else
+-        print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
++        print_info 1 "        >> Skip firmware installation as we rely on external linux-firmware package..."
++	else
++        print_info 1 "        >> Skip firmware installation as we rely on external linux-firmware package..."
+     fi
+ 
+     local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
diff --git a/sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild b/sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild
new file mode 100644
index 00000000..d29d7b2c
--- /dev/null
+++ b/sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-63.ebuild,v 1.3 2015/05/24 20:51:45 zlogene Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://dev.gentoo.org/~lxnay/genkernel-next/${P}.tar.xz"
+else
+	EGIT_REPO_URI="git://github.com/Sabayon/genkernel-next.git"
+	inherit git-2
+fi
+inherit bash-completion-r1 eutils
+
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha amd64 ~arm ~ia64 x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup dmraid gpg iscsi mdadm plymouth selinux"
+
+DEPEND="app-text/asciidoc
+	sys-fs/e2fsprogs
+	!sys-fs/eudev[-kmod,modutils]
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	!sys-kernel/genkernel
+	cryptsetup? ( sys-fs/cryptsetup )
+	dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 )
+	gpg? ( app-crypt/gnupg )
+	iscsi? ( sys-block/open-iscsi )
+	mdadm? ( sys-fs/mdadm )
+	plymouth? ( sys-boot/plymouth[libkms] )
+	app-portage/portage-utils
+	app-arch/cpio
+	>=app-misc/pax-utils-0.6
+	!<sys-apps/openrc-0.9.9
+	sys-apps/util-linux
+	sys-block/thin-provisioning-tools
+	sys-fs/lvm2"
+
+src_prepare() {
+	sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
+		die "Could not setup release"
+
+	epatch "${FILESDIR}"/"${P}"-skip-firmware-install.patch
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	doman "${S}"/genkernel.8 || die "doman"
+	dodoc "${S}"/AUTHORS || die "dodoc"
+
+	newbashcomp "${S}"/genkernel.bash genkernel
+}
diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
deleted file mode 100644
index d7c304e8..00000000
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-63.ebuild,v 1.3 2015/05/24 20:51:45 zlogene Exp $
-
-EAPI=5
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://dev.gentoo.org/~lxnay/genkernel-next/${P}.tar.xz"
-else
-	EGIT_REPO_URI="git://github.com/Sabayon/genkernel-next.git"
-	inherit git-2
-fi
-inherit bash-completion-r1 eutils
-
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha amd64 ~arm ~ia64 x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup dmraid gpg iscsi mdadm plymouth selinux"
-
-DEPEND="app-text/asciidoc
-	sys-fs/e2fsprogs
-	!sys-fs/eudev[-kmod,modutils]
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	!sys-kernel/genkernel
-	cryptsetup? ( sys-fs/cryptsetup )
-	dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 )
-	gpg? ( app-crypt/gnupg )
-	iscsi? ( sys-block/open-iscsi )
-	mdadm? ( sys-fs/mdadm )
-	plymouth? ( sys-boot/plymouth[libkms] )
-	app-portage/portage-utils
-	app-arch/cpio
-	>=app-misc/pax-utils-0.6
-	!<sys-apps/openrc-0.9.9
-	sys-apps/util-linux
-	sys-block/thin-provisioning-tools
-	sys-fs/lvm2"
-
-src_prepare() {
-	sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
-		die "Could not setup release"
-
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	doman "${S}"/genkernel.8 || die "doman"
-	dodoc "${S}"/AUTHORS || die "dodoc"
-
-	newbashcomp "${S}"/genkernel.bash genkernel
-}
diff --git a/sys-kernel/genkernel-next/metadata.xml b/sys-kernel/genkernel-next/metadata.xml
deleted file mode 100644
index 0a4a1a4e..00000000
--- a/sys-kernel/genkernel-next/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<maintainer>
-	<email>lxnay@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='cryptsetup'>Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag>
-	<flag name='dmraid'>Enable support for DMRAID (include dmraid dependency)</flag>
-	<flag name='gpg'>Enable support for GPG (include gnupg dependency)</flag>
-	<flag name='iscsi'>Enable support for open-iscsi (include open-iscsi dependency)</flag>
-	<flag name='plymouth'>Enable support for Plymouth (include Plymouth dependency)</flag>
-</use>
-</pkgmetadata>
-- 
cgit v1.2.3