diff options
| author |   David Seifert <soap@gentoo.org> | 2022-12-27 17:29:54 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2022-12-27 17:29:54 +0100 |
| commit | 975d97fd8c1c4dedf7704aea94d848abb02179ca (patch) | |
| tree | ab409d63e0b59bdd4724761d13b44230d3d3639a /eclass | |
| parent | libretro-core.eclass: drop EAPI 6 support (diff) | |
| download | gentoo-975d97fd8c1c4dedf7704aea94d848abb02179ca.tar.gz gentoo-975d97fd8c1c4dedf7704aea94d848abb02179ca.tar.bz2 gentoo-975d97fd8c1c4dedf7704aea94d848abb02179ca.zip | |
linux-mod.eclass: drop EAPI 6 support
* eutils.eclass functionality was not used in EAPI 7.
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-mod.eclass | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index 22a779ba6125..aea2a38f233e 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # John Mylchreest <johnm@gentoo.org>, # Stefan Schweizer <genstef@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: linux-info # @BLURB: It provides the functionality required to install external modules against a kernel source tree. # @DESCRIPTION: @@ -149,12 +149,8 @@ # @DESCRIPTION: # It's a read-only variable. It contains the extension of the kernel modules. -case ${EAPI:-0} in - [67]) - inherit eutils - ;; - 8) - ;; +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -170,10 +166,6 @@ case ${MODULES_OPTIONAL_USE_IUSE_DEFAULT:-n} in *) _modules_optional_use_iuse_default='+' ;; esac -[[ -n "${_modules_optional_use_iuse_default}" ]] && case ${EAPI:-0} in - 0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;; -esac - IUSE="dist-kernel ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}" SLOT="0" @@ -255,8 +247,8 @@ update_depmod() { move_old_moduledb() { debug-print-function ${FUNCNAME} $* - local OLDDIR="${ROOT%/}"/usr/share/module-rebuild - local NEWDIR="${ROOT%/}"/var/lib/module-rebuild + local OLDDIR="${ROOT}"/usr/share/module-rebuild + local NEWDIR="${ROOT}"/var/lib/module-rebuild if [[ -f "${OLDDIR}"/moduledb ]]; then [[ ! -d "${NEWDIR}" ]] && mkdir -p "${NEWDIR}" @@ -273,7 +265,7 @@ move_old_moduledb() { update_moduledb() { debug-print-function ${FUNCNAME} $* - local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild + local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild move_old_moduledb if [[ ! -f "${MODULEDB_DIR}"/moduledb ]]; then @@ -293,7 +285,7 @@ update_moduledb() { remove_moduledb() { debug-print-function ${FUNCNAME} $* - local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild + local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild move_old_moduledb if grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then @@ -722,8 +714,8 @@ linux-mod_pkg_preinst() { debug-print-function ${FUNCNAME} $* [[ -n ${MODULES_OPTIONAL_USE} ]] && use !${MODULES_OPTIONAL_USE} && return - [[ -d ${D%/}/lib/modules ]] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false - [[ -d ${D%/}/lib/modules ]] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false + [[ -d ${D}/lib/modules ]] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false + [[ -d ${D}/lib/modules ]] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false } # @FUNCTION: linux-mod_pkg_postinst |