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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34EF115A7D9 for ; Fri, 17 Mar 2023 22:04:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 420DF2BC303; Fri, 17 Mar 2023 22:04:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BDEC2BC303 for ; Fri, 17 Mar 2023 22:04:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52529341345 for ; Fri, 17 Mar 2023 22:04:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51A9A8F1 for ; Fri, 17 Mar 2023 22:04:43 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1679090661.8435a16eb3e375dfe0a37f076eb6a1ebfed0a55b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/linux-info.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8435a16eb3e375dfe0a37f076eb6a1ebfed0a55b X-VCS-Branch: master Date: Fri, 17 Mar 2023 22:04:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5984407-b4d4-4209-afc9-fc0efed796ef X-Archives-Hash: 232dd96eb986a7c7bda8ae30feeb878e commit: 8435a16eb3e375dfe0a37f076eb6a1ebfed0a55b Author: David Seifert gentoo org> AuthorDate: Fri Mar 17 22:04:21 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Mar 17 22:04:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8435a16e linux-info.eclass: remove EAPI 0-5 Signed-off-by: David Seifert gentoo.org> eclass/linux-info.eclass | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index a65d0c441ba2..ce04a0dc66a7 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,9 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-info.eclass # @MAINTAINER: # kernel@gentoo.org +# @SUPPORTED_EAPIS: 6 7 8 # @AUTHOR: # Original author: John Mylchreest # @BLURB: eclass used for accessing kernel related information @@ -26,6 +27,14 @@ # get_version # get_running_version +case ${EAPI} in + 6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + +if [[ -z ${_LINUX_INFO_ECLASS} ]]; then +_LINUX_INFO_ECLASS=1 + # A Couple of env vars are available to effect usage of this eclass # These are as follows: @@ -151,9 +160,7 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # And to ensure all the weirdness with crosscompile inherit toolchain-funcs -[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver - -EXPORT_FUNCTIONS pkg_setup +[[ ${EAPI} == 6 ]] && inherit eapi7-ver # bug #75034 case ${ARCH} in @@ -231,7 +238,6 @@ getfilevar() { # We use nonfatal because we want the caller to take care of things #373151 # Pass need-config= to make to avoid config check in kernel Makefile. # Pass dot-config=0 to avoid the config check in kernels prior to 5.4. - [[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; } echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ nonfatal emake -C "${basedname}" --no-print-directory M="${T}" \ dot-config=0 need-config= need-compiler= \ @@ -1009,3 +1015,7 @@ kernel_get_makefile() { [[ -s ${KV_DIR}/Makefile ]] && KERNEL_MAKEFILE="${KV_DIR}/Makefile" && return } + +fi + +EXPORT_FUNCTIONS pkg_setup