commit:     cafa530610ec9fd0522273c64975b2b7a2cbf823
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 18:07:34 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 20:13:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafa5306

kernel-install.eclass: drop EAPI 7 support

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/kernel-install.eclass | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index fba65a76ccce..49aff35dea0d 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 8
+# @SUPPORTED_EAPIS: 8
 # @PROVIDES: dist-kernel-utils
 # @BLURB: Installation mechanics for Distribution Kernels
 # @DESCRIPTION:
@@ -29,9 +29,10 @@
 # kernel-build.eclass obtains it from kernel config.
 
 if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then
+_KERNEL_INSTALL_ECLASS=1
 
 case ${EAPI} in
-       7|8) ;;
+       8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -46,17 +47,12 @@ RESTRICT+="
 "
 
 # note: we need installkernel with initramfs support!
-_INSTALL_DEPEND="
+IDEPEND="
        || (
                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
@@ -533,7 +529,6 @@ kernel-install_pkg_config() {
        kernel-install_install_all "${PV}${KV_LOCALVERSION}"
 }
 
-_KERNEL_INSTALL_ECLASS=1
 fi
 
 EXPORT_FUNCTIONS src_test pkg_preinst pkg_postinst pkg_prerm pkg_postrm

Reply via email to