Clearer solution to building bzImage in the right phases

Requires patched genkernel-next, bug filed Sabayon/genkernel-next#89
rascalDan · Jun 29, 2020 · aef939a · aef939a
1 parent 9ca7867
commit aef939a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/sys-kernel/bzImage/Manifest b/sys-kernel/bzImage/Manifest
@@ -1,2 +1,2 @@
-EBUILD bzImage-0.1.ebuild 2710 BLAKE2B cdcd395defe04b99031912f2236f919b2d848428ab5c4006f6a33e5d391a92b52fa7738f89bafaf13f88b936b8ff826620eda16e6e71c4bc6724fb949ff1c00f SHA512 04ac28f63cd6123702a05bc7baa51e354133cdfa3cb9bde0771be677a4dd19fea2e3b47ae881720057eadfe35fe7f8fb7e5f65dc3c1109b09387efca68bd38fb
+EBUILD bzImage-0.1.ebuild 2620 BLAKE2B 3b5a5c1bfb714296a5cc058892a43c045ad03b42bf6d7082635ab363dda47b7e60483cde3a2ceac573fde04e373b97bea917e49407262e06acf42c0342b584d1 SHA512 dce182af8c1c88317db142d7902239c37ddde452abb857b7cf471068540211d9b84b95829fcd6bc907e56faf4d4059e1c7a7e0506b3621009a68367fd9a99f50
 EBUILD bzImage-0.ebuild 1730 BLAKE2B 522a27a1b1ca50c7cc9e90b1fb792e9d5ac2205834588104f3da333e21401385343f8d419aabcbe417fd7b663ae87d457cd4e5ebd2236e320aded1dd7791f2dc SHA512 bb155fc7578c53b82e14ff3cbbb41018d4272fcad4199c1d417b12ca0278922a04a7b7925a6b4e9df3a70c107dec9fbf2a7a3fdea415847efeafc82e18116627
diff --git a/sys-kernel/bzImage/bzImage-0.1.ebuild b/sys-kernel/bzImage/bzImage-0.1.ebuild
@@ -58,7 +58,6 @@ src_configure() {
 		--module-prefix=${D}
 		--no-save-config
 		--no-clean
-		--no-oldconfig
 		$(enableif lvm)
 		$(enableif mdadm)
 		$(enableif dmraid)
@@ -73,12 +72,10 @@ src_configure() {
 		"
 	einfo "Base genkernel options ${GENKERNELOPTS}"
 	set_arch_to_kernel
-	emake -C ${KERNEL_DIR} O=${S} oldconfig
 }
 
 src_compile() {
-	emake -C ${KERNEL_DIR} O=${S} ARCH=${ARCH} prepare
-	emake -C ${KERNEL_DIR} O=${S} ARCH=${ARCH} bzImage modules
+	genkernel $GENKERNELOPTS --no-install kernel || die genkernel failed
 }
 
 src_install() {
@@ -88,7 +85,7 @@ src_install() {
 	addwrite /etc/ld.so.cache~
 	addwrite /etc/ld.so.cache
 	mkdir ${D}/boot
-	genkernel $GENKERNELOPTS all || die genkernel failed
+	genkernel $GENKERNELOPTS --install all || die genkernel failed
 	emake -C ${KERNEL_DIR} O=${S} clean
 
 	dosym ${KBUILD_OUTPUT} /lib/modules/${KV_FULL}/build