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

  • [gentoo-dev] [PATCH] Clean deblob

    From Alice Ferrazzi@21:1/5 to All on Thu Aug 26 08:00:02 2021
    As we are moving out to deprecate EAPI=6 from kernel-2.eclass
    start removing it from deblob function. Also clean code linked to old
    kernel versions. kernel sources that use deblob are already updated to
    EAPI=8

    Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>
    ---
    eclass/kernel-2.eclass | 11 -----------
    1 file changed, 11 deletions(-)

    diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
    index 58e0bae94e..36e081541e 100644
    --- a/eclass/kernel-2.eclass
    +++ b/eclass/kernel-2.eclass
    @@ -220,11 +220,6 @@ fi
    HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}"
    : ${LICENSE:="GPL-2"}

    -# This is the latest KV_PATCH of the deblob tool available from the
    -# libre-sources upstream. If you bump this, you MUST regenerate the Manifests -# for ALL kernel-2 consumer packages where deblob is available.
    -: ${DEBLOB_MAX_VERSION:=38}
    -
    # No need to run scanelf/strip on kernel sources/headers (bug #134453).
    RESTRICT="binchecks strip"

    @@ -600,11 +595,6 @@ if [[ ${ETYPE} == sources ]]; then

    # Bug #266157, deblob for libre support
    if [[ -z ${K_PREDEBLOBBED} ]]; then
    - # Bug #359865, force a call to detect_version if needed
    - kernel_is ge 2 6 27 && \
    - [[ -z ${K_DEBLOB_AVAILABLE} ]] && \
    - kernel_is le 2 6
  • From Ulrich Mueller@21:1/5 to All on Thu Aug 26 11:10:02 2021
    On Thu, 26 Aug 2021, Alice Ferrazzi wrote:

    As we are moving out to deprecate EAPI=6 from kernel-2.eclass
    start removing it from deblob function. Also clean code linked to old
    kernel versions. kernel sources that use deblob are already updated to
    EAPI=8

    Somewhat unrelated, since I see calls to kernel_is() in your patch:

    That function has a horrible hack for version comparison:

    : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
    : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
    [ ${test} ${operator} ${value} ]

    There are versions like gentoo-sources-4.9.280, so the shift by 8 may
    cause surprising results.

    I'll send a patch later.

    Ulrich

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

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmEnV/wPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4utOEH/A4TX0qyQeO1uHpU3Ior1YI1Qec6zQWlf+9h yDUYEKv/Q1obEQdtK9B+RDEz68YWxwVyT/Koj07DasZCIjsYfxQQ130oc/VX2oT5 fVZpyvCowSmELojMMFaj/qG5IfdfP9T6BU5mBlB/h0RO99Bjq/3+fkTaNDWbWsxE XZ5mTtdVIbutGj+Qs56j4+70rGlgQ+p0dM2JJzqv7OucCZ8icKthZW9JDSFgcyW1 qZ50beb3FI9cEX4fTlu2gahFMPKXycBXvzN4KbWTBohBCJFZC2sUkFaPNMfLg4mO LveABrhKLtF4HTkgGDgp/dnrni+uMbtSneDD25MOH9TGAIgO7SM=
    =RGDF
    -----END PGP SIGNATURE-----

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