commit: 72365d3d7f15948e519e2d6a11214f92b0010635
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 19:40:24 2022 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 19:40:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72365d3d
linux-mod.eclass: enable EAPI 8, remove EAPI 5
Clean-up code needed for deprecated EAPIs (EAPI < 4)
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
eclass/linux-mod.eclass | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 496b9c98b526..3aabe7e9d664 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# John Mylchreest <jo...@gentoo.org>,
# Stefan Schweizer <gens...@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @PROVIDES: linux-info
# @BLURB: It provides the functionality required to install external modules
against a kernel source tree.
# @DESCRIPTION:
@@ -150,7 +150,7 @@
# It's a read-only variable. It contains the extension of the kernel modules.
case ${EAPI:-0} in
- [567]) inherit eutils ;;
+ [678]) inherit eutils ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -603,11 +603,6 @@ linux-mod_pkg_setup() {
local is_bin="${MERGE_TYPE}"
# If we are installing a binpkg, take a different path.
- # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM
(eapi<4)
- if has ${EAPI} 0 1 2 3; then
- is_bin=${EMERGE_FROM}
- fi
-
if [[ ${is_bin} == binary ]]; then
linux-mod_pkg_setup_binary
return
