| 1 |
On 2/10/22 15:41, Anna Vyalkova wrote: |
| 2 |
> On 2022-02-10 14:40, Mike Pagano wrote: |
| 3 |
>> Clean-up code needed for deprecated EAPIs (EAPI < 4) |
| 4 |
>> |
| 5 |
>> Signed-off-by: Mike Pagano <mpagano@g.o> |
| 6 |
>> --- |
| 7 |
>> eclass/linux-mod.eclass | 9 ++------- |
| 8 |
>> 1 file changed, 2 insertions(+), 7 deletions(-) |
| 9 |
>> |
| 10 |
>> diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass |
| 11 |
>> index 496b9c98b..3aabe7e9d 100644 |
| 12 |
>> --- a/eclass/linux-mod.eclass |
| 13 |
>> +++ b/eclass/linux-mod.eclass |
| 14 |
>> @@ -7,7 +7,7 @@ |
| 15 |
>> # @AUTHOR: |
| 16 |
>> # John Mylchreest <johnm@g.o>, |
| 17 |
>> # Stefan Schweizer <genstef@g.o> |
| 18 |
>> -# @SUPPORTED_EAPIS: 5 6 7 |
| 19 |
>> +# @SUPPORTED_EAPIS: 6 7 8 |
| 20 |
>> # @PROVIDES: linux-info |
| 21 |
>> # @BLURB: It provides the functionality required to install external modules against a kernel source tree. |
| 22 |
>> # @DESCRIPTION: |
| 23 |
>> @@ -150,7 +150,7 @@ |
| 24 |
>> # It's a read-only variable. It contains the extension of the kernel modules. |
| 25 |
>> |
| 26 |
>> case ${EAPI:-0} in |
| 27 |
>> - [567]) inherit eutils ;; |
| 28 |
>> + [678]) inherit eutils ;; |
| 29 |
> |
| 30 |
> eutils.eclass doesn't suport EAPI 8 |
| 31 |
> |
| 32 |
>> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 33 |
>> esac |
| 34 |
>> |
| 35 |
>> @@ -603,11 +603,6 @@ linux-mod_pkg_setup() { |
| 36 |
>> local is_bin="${MERGE_TYPE}" |
| 37 |
>> |
| 38 |
>> # If we are installing a binpkg, take a different path. |
| 39 |
>> - # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4) |
| 40 |
>> - if has ${EAPI} 0 1 2 3; then |
| 41 |
>> - is_bin=${EMERGE_FROM} |
| 42 |
>> - fi |
| 43 |
>> - |
| 44 |
>> if [[ ${is_bin} == binary ]]; then |
| 45 |
>> linux-mod_pkg_setup_binary |
| 46 |
>> return |
| 47 |
>> -- |
| 48 |
>> 2.34.1 |
| 49 |
>> |
| 50 |
> |
| 51 |
|
| 52 |
Thanks for the catch. Fixed and committed. |
| 53 |
|
| 54 |
-- |
| 55 |
Mike Pagano |
| 56 |
Gentoo Developer - Kernel Project |
| 57 |
Gentoo Sources - Lead |
| 58 |
E-Mail : mpagano@g.o |
| 59 |
GnuPG FP : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137 |
| 60 |
Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index |
Archives