[gentoo-dev] [PATCH] linux-info.eclass: enable EAPI 7

[gentoo-dev] [PATCH] linux-info.eclass: enable EAPI 7

[Marty E. Plummer]

versionator is banned in EAPI 7, so switch to either native EAPI 7
version functions or inherit eapi7-ver on EAPI 0-6
---
 eclass/linux-info.eclass | 9 +++++----
 1 file 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
-- 
2.18.0

Re: [gentoo-dev] [PATCH] linux-info.eclass: enable EAPI 7

[Thomas Deutschmann]

[-- Attachment #1.1: Type: text/plain, Size: 440 bytes --]

On 2018-07-11 04:02, Marty E. Plummer wrote:
> versionator is banned in EAPI 7, so switch to either native EAPI 7
> version functions or inherit eapi7-ver on EAPI 0-6
> ---
> [...]
Thanks, this is now merged [1].


[1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b150836dfef848e51ec2cce801b12daf2c77b1


-- 
Regards,
Thomas Deutschmann / Gentoo Linux Developer
C4DD 695F A713 8F24 2AA1 5638 5849 7EE5 1D5D 74A5


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

[gentoo-dev] [PATCH] linux-info.eclass: enable EAPI 7

[Marty E. Plummer]

versionator is banned in EAPI 7, so switch to either native EAPI 7
version functions or inherit eapi7-ver on EAPI 0-6
---
 eclass/linux-info.eclass | 9 +++++----
 1 file 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
-- 
2.18.0