summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-07-14 00:05:41 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-07-14 00:08:29 +0200
commitc6b150836dfef848e51ec2cce801b12daf2c77b1 (patch)
tree85d61a75cec584d15e0bf6b2844e6e9b92666017 /eclass/linux-info.eclass
parentxfce-extra/xfce4-mount-plugin: Fix the LICENSE (diff)
downloadgentoo-c6b150836dfef848e51ec2cce801b12daf2c77b1.tar.gz
gentoo-c6b150836dfef848e51ec2cce801b12daf2c77b1.tar.bz2
gentoo-c6b150836dfef848e51ec2cce801b12daf2c77b1.zip
linux-info.eclass: use eapi7-ver
versionator is banned in EAPI 7, so switch to either native EAPI 7 version functions or inherit eapi7-ver on EAPI 0-6. Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'eclass/linux-info.eclass')
-rw-r--r--eclass/linux-info.eclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 77df7a6ad60..96f94e4072a 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -106,7 +106,8 @@
# KBUILD_OUTPUT is used. This should be used for referencing .config.
# And to ensure all the weirdness with crosscompile
-inherit toolchain-funcs versionator
+inherit toolchain-funcs
+[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver
EXPORT_FUNCTIONS pkg_setup
@@ -634,9 +635,9 @@ get_running_version() {
# This handles a variety of weird kernel versions. Make sure to update
# tests/linux-info_get_running_version.sh if you want to change this.
local kv_full=${KV_FULL//[-+_]*}
- KV_MAJOR=$(get_version_component_range 1 ${kv_full})
- KV_MINOR=$(get_version_component_range 2 ${kv_full})
- KV_PATCH=$(get_version_component_range 3 ${kv_full})
+ KV_MAJOR=$(ver_cut 1 ${kv_full})
+ KV_MINOR=$(ver_cut 2 ${kv_full})
+ KV_PATCH=$(ver_cut 3 ${kv_full})
KV_EXTRA="${KV_FULL#${KV_MAJOR}.${KV_MINOR}${KV_PATCH:+.${KV_PATCH}}}"
: ${KV_PATCH:=0}
fi