[gentoo-catalyst] genkernel-next instead of genkernel?

["Kuzminsky, Sebastian" <Sebastian.Kuzminsky@netapp.com>]

[-- Attachment #1.1: Type: text/plain, Size: 858 bytes --]

Hello catalysts, I need to build a systemd-based stage4 with a kernel.


I think this means I need to provide a binary kernel package "out of band" as suggested in the catalyst HOWTO, or switch catalyst to use genkernel-next.


I prefer to teach catalyst to use genkernel-next, because it simplifies my build system to have catalyst do everything.  Iit was pretty easy to get this going.  I'm attaching my tiny patches (against the 2.X branch) as a starting place.  These patches switch catalyst entirely away from genkernel and to genkernel-next, which does what I need but is a little heavy handed...


If this looks like a useful approach i'll be happy to try to integrate these changes more cleanly, perhaps by letting the user select (in the catalyst-spec) between genkernel and -next.


Feedback is welcome.



--
Sebastian Kuzminsky

[-- Attachment #1.2: Type: text/html, Size: 1743 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-accept-any-version-of-genkernel.patch --]
[-- Type: text/x-patch; name="0002-accept-any-version-of-genkernel.patch", Size: 1015 bytes --]

From eb9d9dbae358cf4ece6f8f35fd7277e3cd1d39e4 Mon Sep 17 00:00:00 2001
From: Sebastian Kuzminsky <seb@highlab.com>
Date: Thu, 29 Sep 2016 16:06:00 -0600
Subject: [PATCH 2/2] accept any version of genkernel

---
 targets/support/chroot-functions.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 67874a0..38f6e61 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -29,9 +29,10 @@ check_genkernel_version(){
 		then
 			echo "Genkernel version ${genkernel_version} found ... continuing"
 		else
-			echo "ERROR: Your genkernel version is too low in your seed stage.  genkernel version 3.3.0"
-			echo "or greater is required."
-			exit 1
+			echo "ERROR: Your genkernel version ${genkernel_version} is too low in your seed"
+			echo "stage.  genkernel version 3.3.0 or greater is required."
+			echo "continuing anyway"
+			#exit 1
 		fi
 	else
 		exit 1
-- 
2.7.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-emerge-genkernel-next-instead-of-genkernel.patch --]
[-- Type: text/x-patch; name="0001-emerge-genkernel-next-instead-of-genkernel.patch", Size: 646 bytes --]

From 24366cc3ca06a3a007c547cbfacd5aaa1761e3f5 Mon Sep 17 00:00:00 2001
From: Sebastian Kuzminsky <seb@highlab.com>
Date: Thu, 29 Sep 2016 15:46:30 -0600
Subject: [PATCH 1/2] emerge genkernel-next instead of genkernel

---
 targets/support/pre-kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index dd51ae9..f679df0 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -29,5 +29,5 @@ case ${clst_hostarch} in
 	;;
 esac
 
-run_merge --oneshot genkernel
+run_merge --oneshot genkernel-next
 install -d /tmp/kerncache
-- 
2.7.3