commit: aa7cafd50cc9f174f4d1bbc075db680f143e577e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 15:37:31 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 01:17:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7cafd5
kernel-install.eclass: support EAPI 8
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
eclass/kernel-install.eclass | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 8acf1ad1bc05..dc77cb514b1a 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <dist-ker...@gentoo.org>
# @AUTHOR:
# Michał Górny <mgo...@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: dist-kernel-utils
# @BLURB: Installation mechanics for Distribution Kernels
# @DESCRIPTION:
@@ -30,15 +30,9 @@
if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then
-case "${EAPI:-0}" in
- 0|1|2|3|4|5|6)
- die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
- ;;
- 7)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
inherit dist-kernel-utils mount-boot toolchain-funcs
@@ -51,14 +45,18 @@ RESTRICT+="
arm? ( test )
"
-# install-DEPEND actually
# note: we need installkernel with initramfs support!
-RDEPEND="
+_INSTALL_DEPEND="
|| (
sys-kernel/installkernel-gentoo
sys-kernel/installkernel-systemd-boot
)
initramfs? ( >=sys-kernel/dracut-049-r3 )"
+if [[ ${EAPI} == 7 ]]; then
+ RDEPEND="${_INSTALL_DEPEND}"
+else
+ IDEPEND="${_INSTALL_DEPEND}"
+fi
# needed by objtool that is installed along with the kernel and used
# to build external modules
# NB: linux-mod.eclass also adds this dep but it's cleaner to have
