On 2022-02-10 14:40, Mike Pagano wrote:

Clean-up code needed for deprecated EAPIs (EAPI < 4)

Signed-off-by: Mike Pagano <[email protected]>
---
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 <[email protected]>,
# Stefan Schweizer <[email protected]>
-# @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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On Sat, Feb 12, 2022 at 02:52:09PM -0500, Mike wrote:

On 2/10/22 15:41, Anna Vyalkova wrote:

eutils.eclass doesn't suport EAPI 8

Thanks for the catch. Fixed and committed.

It'd be good not to go too fast with this, new version wasn't reviewed.

- [678]) inherit eutils ;;
+ [67]) inherit eutils ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;

Now it dies on EAPI=8, which thankfully is not harmful given no
ebuilds use it yet.
--
ionen

-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEx3SLh1HBoPy/yLVYskQGsLCsQzQFAmIIElgACgkQskQGsLCs QzRJQQf8D6QWWuvwN7Iy9NePJgbuFsHsrg2AmBPSD3bExM1v3FPaACFSx9IKYVpy 9dQXWnhDbmdI3DfMrGy59tMjgKgfyIlVr0b7bkUWAe0cxyVbZft9/bydyNPKEIKO 021N4nsv6jYVs0dvsnYu9bHt2MeEp503V5sRUjZ1cg0Q5/exXtbWrKuHce36cgIi SK+lr48Vkl+SJaSCVaoGI72uyomoSOzirgT0LVTx28prMbxSvdf706UhPWS1Dnfg uRtI1H/u6s7WkCkqP/VqPyp3Ks3CRp+2NBRLscJIk2r1f4e12yRysscqw7mY4GnE RiZePYobUiUR/N9Jxt/3Ph4+p3fJrA==
=2u+7
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------mHvpXTofNYjXaycT59lnfyUU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable


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 <[email protected]>
---
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 <[email protected]>,
# Stefan Schweizer <[email protected]>
-# @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 : [email protected]
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

--------------mHvpXTofNYjXaycT59lnfyUU--

-----BEGIN PGP SIGNATURE-----

wsF5BAABCAAjFiEEBGFuxmO2fsZ/M0XX+h2KeGDML5YFAmIID+kFAwAAAAAACgkQ+h2KeGDML5ac DQ//ejiiAWZQWl6PI/ayL6eMDEiVFypdrN3XKJid2LqIvmlzb57bKyza594KTcUOz3jaQFypAaFE DiknOVhz0GNbJskVXNlyglullKe0IL1xCq4VX1yO9lebtNN6hkD305qgl1LNVoNAcGr+2LOPgbUk 2RlSvLbx3iFBO8ZWwNdvHEczsuDklBjtOs6PhFRctNYXBqheArIPnbUXwu7+au1uym8M2E/x++nN Lm++dq9o2KAewrNmyLcQy4bm3cOcP7VRn4Qqi9GXDh6ApWBb6rOkJxWvDzVK6xwuaCUbdYK+RCw+ UYnaVG7e5mbmDJuogizuKAvKvZ13xfzhggkt+4l4VHISa+Hh884R6aSTIMODb5I5fR5UgGKalNXP t1zl/XuKvCWswH6wV0aXj/4lXYGm30nmd1cgF3mSPGE4b1+4RQHUVp2l7XMwGP4e4RYHWFOQsUC2 99L+jMnp7BQP3q4cKMM1mTWb+5vd1MT/dy/e2sfBti4rS9rmV2vARMPaC0KoVrPUE+B1RvJXPYJw Cdy/a+rZMf0cfLHDPH69twUa1kDqycLZY4JdL3fxMhctu47dbZ804o5kHf9lTdILjExsr0GNM++F 8/tj/0rL6NWF39BQpUysHE3Z6GV/7Tujevj6x+VBVq1tuFQZVgSaY+5rUKob3n1oDH0oXctP4l/M p3U=
=N5jD
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On 2/12/22 15:02, Ionen Wolkens wrote:

On Sat, Feb 12, 2022 at 02:52:09PM -0500, Mike wrote:

On 2/10/22 15:41, Anna Vyalkova wrote:

eutils.eclass doesn't suport EAPI 8

Thanks for the catch. Fixed and committed.

It'd be good not to go too fast with this, new version wasn't reviewed.

- [678]) inherit eutils ;;
+ [67]) inherit eutils ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;

Now it dies on EAPI=8, which thankfully is not harmful given no
ebuilds use it yet.

Thanks for your review. Committed fix.

--
Mike Pagano
Gentoo Developer - Kernel Project
Gentoo Sources - Lead
E-Mail : [email protected]
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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)