On 2/10/22 15:41, Anna Vyalkova wrote:
> On 2022-02-10 14:40, Mike Pagano wrote:
>> Clean-up code needed for deprecated EAPIs (EAPI < 4)
>>
>> Signed-off-by: Mike Pagano <mpag...@gentoo.org>
>> ---
>> eclass/linux-mod.eclass | 9 ++-------
>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
>> index 496b9c98b..3aabe7e9d 100644
>> --- a/eclass/linux-mod.eclass
>> +++ b/eclass/linux-mod.eclass
>> @@ -7,7 +7,7 @@
>> # @AUTHOR:
>> # John Mylchreest <jo...@gentoo.org>,
>> # Stefan Schweizer <gens...@gentoo.org>
>> -# @SUPPORTED_EAPIS: 5 6 7
>> +# @SUPPORTED_EAPIS: 6 7 8
>> # @PROVIDES: linux-info
>> # @BLURB: It provides the functionality required to install external
>> modules against a kernel source tree.
>> # @DESCRIPTION:
>> @@ -150,7 +150,7 @@
>> # It's a read-only variable. It contains the extension of the kernel
>> modules.
>>
>> case ${EAPI:-0} in
>> - [567]) inherit eutils ;;
>> + [678]) inherit eutils ;;
>
> eutils.eclass doesn't suport EAPI 8
>
>> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
>> esac
>>
>> @@ -603,11 +603,6 @@ linux-mod_pkg_setup() {
>> local is_bin="${MERGE_TYPE}"
>>
>> # If we are installing a binpkg, take a different path.
>> - # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM
>> (eapi<4)
>> - if has ${EAPI} 0 1 2 3; then
>> - is_bin=${EMERGE_FROM}
>> - fi
>> -
>> if [[ ${is_bin} == binary ]]; then
>> linux-mod_pkg_setup_binary
>> return
>> --
>> 2.34.1
>>
> Thanks for the catch. Fixed and committed. -- Mike Pagano Gentoo Developer - Kernel Project Gentoo Sources - Lead E-Mail : mpag...@gentoo.org GnuPG FP : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137 Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index
OpenPGP_signature
Description: OpenPGP digital signature
