1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 1/2] kernel-2.eclass: remove EAPI 6

    From David Seifert@21:1/5 to All on Fri Apr 15 16:10:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/kernel-2.eclass | 26 ++++++++++++--------------
    1 file changed, 12 insertions(+), 14 deletions(-)

    diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
    index bd982d3a52c..51dabc4562d 100644
    --- a/eclass/kernel-2.eclass
    +++ b/eclass/kernel-2.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: kernel-2.eclass
    @@ -8,7 +8,7 @@
    # John Mylchreest <johnm@gentoo.org>
    # Mike Pagano <mpagano@gentoo.org>
    # <so many, many others, please add yourself>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Eclass for kernel packages
    # @DESCRIPTION:
    # This is the kernel.eclass rewrite for a clean base regarding the 2.6
    @@ -282,10 +282,9 @@
    # that of course does not mean we're not willing to help.

    inherit estack toolchain-funcs
    -[[ ${EAPI} == 6 ]] && inherit eapi7-ver

    case ${EAPI} in
    - 6|7|8) ;;
    + 7|8) ;;
    *) die "${ECLASS}: EAP
  • From David Seifert@21:1/5 to All on Fri Apr 15 16:10:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/kernel-2.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
    index 51dabc4562d..02c70422ee0 100644
    --- a/eclass/kernel-2.eclass
    +++ b/eclass/kernel-2.eclass
    @@ -670,7 +670,7 @@ if [[ ${ETYPE} == sources ]]; then
    )"

    SLOT="${PVR}"
    - DESCRIPTION="Sources based on the Linux Kernel."
    + DESCRIPTION="Sources based on the Linux Kernel"
    IUSE="symlink build"

    # Bug #266157, deblob for libre support
    @@ -932,7 +932,7 @@ postinst_sources() {
    # if we are to forcably symlink, delete it if it already exists first.
    if [[ ${K_SYMLINK} -gt 0 ]]; then
    if [[ -e ${EROOT}/usr/src/linux && ! -L ${EROOT}/usr/src/linux ]] ; then
    - die "${EROOT}/usr/src/linux exist and is not a symlink" + die "${EROOT}/usr/src/linux exists and is not a symlink"
    fi

    ln -snf linux-${KV_FULL} "${EROOT}"/usr/src/linux || die
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Mike Pagano@21:1/5 to David Seifert on Fri Apr 15 16:20:01 2022
    On 4/15/22 10:06, David Seifert wrote:
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/kernel-2.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
    index 51dabc4562d..02c70422ee0 100644
    --- a/eclass/kernel-2.eclass
    +++ b/eclass/kernel-2.eclass
    @@ -670,7 +670,7 @@ if [[ ${ETYPE} == sources ]]; then
    )"

    SLOT="${PVR}"
    - DESCRIPTION="Sources based on the Linux Kernel."
    + DESCRIPTION="Sources based on the Linux Kernel"
    IUSE="symlink build"

    # Bug #266157, deblob for libre support
    @@ -932,7 +932,7 @@ postinst_sources() {
    # if we are to forcably symlink, delete it if it already exists first.
    if [[ ${K_SYMLINK} -gt 0 ]]; then
    if [[ -e ${EROOT}/usr/src/linux && ! -L ${EROOT}/usr/src/linux ]] ; then
    - die "${EROOT}/usr/src/linux exist and is not a symlink" + die "${EROOT}/usr/src/linux exists and is not a symlink"
    fi

    ln -snf linux-${KV_FULL} "${EROOT}"/usr/src/linux || die

    LGTM

    --
    Mike Pagano
    Gentoo Developer - Kernel Project
    Gentoo Sources - Lead
    E-Mail : mpagano@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

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