| 1 |
On 2022-02-10 14:40, Mike Pagano wrote: |
| 2 |
> Clean-up code needed for deprecated EAPIs (EAPI < 4) |
| 3 |
> |
| 4 |
> Signed-off-by: Mike Pagano <mpagano@g.o> |
| 5 |
> --- |
| 6 |
> eclass/linux-mod.eclass | 9 ++------- |
| 7 |
> 1 file changed, 2 insertions(+), 7 deletions(-) |
| 8 |
> |
| 9 |
> diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass |
| 10 |
> index 496b9c98b..3aabe7e9d 100644 |
| 11 |
> --- a/eclass/linux-mod.eclass |
| 12 |
> +++ b/eclass/linux-mod.eclass |
| 13 |
> @@ -7,7 +7,7 @@ |
| 14 |
> # @AUTHOR: |
| 15 |
> # John Mylchreest <johnm@g.o>, |
| 16 |
> # Stefan Schweizer <genstef@g.o> |
| 17 |
> -# @SUPPORTED_EAPIS: 5 6 7 |
| 18 |
> +# @SUPPORTED_EAPIS: 6 7 8 |
| 19 |
> # @PROVIDES: linux-info |
| 20 |
> # @BLURB: It provides the functionality required to install external modules against a kernel source tree. |
| 21 |
> # @DESCRIPTION: |
| 22 |
> @@ -150,7 +150,7 @@ |
| 23 |
> # It's a read-only variable. It contains the extension of the kernel modules. |
| 24 |
> |
| 25 |
> case ${EAPI:-0} in |
| 26 |
> - [567]) inherit eutils ;; |
| 27 |
> + [678]) inherit eutils ;; |
| 28 |
|
| 29 |
eutils.eclass doesn't suport EAPI 8 |
| 30 |
|
| 31 |
> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 32 |
> esac |
| 33 |
> |
| 34 |
> @@ -603,11 +603,6 @@ linux-mod_pkg_setup() { |
| 35 |
> local is_bin="${MERGE_TYPE}" |
| 36 |
> |
| 37 |
> # If we are installing a binpkg, take a different path. |
| 38 |
> - # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4) |
| 39 |
> - if has ${EAPI} 0 1 2 3; then |
| 40 |
> - is_bin=${EMERGE_FROM} |
| 41 |
> - fi |
| 42 |
> - |
| 43 |
> if [[ ${is_bin} == binary ]]; then |
| 44 |
> linux-mod_pkg_setup_binary |
| 45 |
> return |
| 46 |
> -- |
| 47 |
> 2.34.1 |
| 48 |
> |
Archives