From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7F3B138334 for ; Wed, 11 Jul 2018 02:04:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35037E0880; Wed, 11 Jul 2018 02:04:14 +0000 (UTC) Received: from mx-out2.startmail.com (mx-out2.startmail.com [145.131.90.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B26FCE087C for ; Wed, 11 Jul 2018 02:04:13 +0000 (UTC) From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1531274651; bh=vcFuP+lSXN/Z+yJ0Bf1X0jSU1tWuOTI2WV7C0vE2rYg=; h=From:To:Cc:Subject:Date:From; b=cbL+VFfOE3JPD6mAaxBDk2UtFdt61rBVW9wxh5x1jLsogoyzUYyFDdDzjrGPbwmSF zhHBvp8JL2rJ8U83LVfEqQRGhYE7xNXHbl+C+/IZD4kOpbib8JkFf589h9oxppiLmr B++CC25MQhUHw8PWtG+QIXcOvXf9Co9BDDF3yUqkxHR+MwzYqhD9SHKfyotQYB2gJM 4vjeOuKj1/3utyDfcny9b/Gvky+MW0zHJxYopkuHXJ2OmGbH9hpKa+MNodZoamyooV j657B6KAHtU8l9xv728AFUwtTZIsbbr/CFEfVx0LnZi3ZLHSrrV/nuk6BhTtj5ak0P n7CKUlv/sOI6A== To: gentoo-dev@lists.gentoo.org Cc: "Marty E. Plummer" Subject: [gentoo-dev] [PATCH] linux-info.eclass: enable EAPI 7 Date: Tue, 10 Jul 2018 21:02:51 -0500 Message-Id: <20180711020251.8105-1-hanetzer@startmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: ca250bc6-d1cd-4a25-b29f-e47d16f8f84b X-Archives-Hash: 0bef591a8e08bdc8a64a42720211f605 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