commit:     913094a7efefab2795e34e852506820116299458
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 15:19:04 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 17 19:29:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913094a7

sys-kernel/gentoo-kernel: Bump to 6.2.16

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.2.16.ebuild      | 140 +++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 430b7e1e3cdf..1ecdafeb633f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-33.base.tar.xz 1668040 BLAKE2B 
60823b42a19d54af313039f75bbd4
 DIST genpatches-6.1-33.extras.tar.xz 3812 BLAKE2B 
4c0552c0cd447cff8e1725dbcabe9ae02be41f432805b6e5e9fd360c6a0d745b5bb5d0dd5c7b36a3e0468622dcf89d3d7fcf47f0b1b1735f76ca281764c928ed
 SHA512 
fc1efc3695e71daf5d3445758ba0af5a8714c22b9d3788f59bba0e4383dadc91ebb14e3114aa711b270c2734f3bd8355b6b7e98c9b81580b9da8c9ffe6207cae
 DIST genpatches-6.2-18.base.tar.xz 995956 BLAKE2B 
402258df823b898522612e18c9d0c51c38cdedc9b4934961989de768c8feb7ce0287f3354a75a97a2a0bcad13e74bbfadff8233b22ae816149f9eec85c8c6553
 SHA512 
1162522ff7d5a4408b1a1eb5d220822cd5e3db11c9948dcbc011dce67d3022d7af643cff81b2900e91957bebe0f00589bb7db93617e800dc3837f3f537eb1969
 DIST genpatches-6.2-18.extras.tar.xz 3808 BLAKE2B 
4c80c3e537e6ea6ea2a9d720127bd5a661417ec94ddb373d6301334108c9765e985723475c85dd0acadce92811b7bd1a96f68cf657a4e943f8be49bddf641eb6
 SHA512 
8a63c7432326af46c1d9c5e3170f3cae77a35b3c7ccf4ece155418915ee21b511e7b32e7b377976773a5e188d43eb39dc8f435de269779b5192761f21414db37
+DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B 
a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7
 SHA512 
bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
+DIST genpatches-6.2-19.extras.tar.xz 3808 BLAKE2B 
cd58fa1bc082b4cc6f45e1d8332921f78ce4eb8356c6510c6df2eac06778695ec98e4f68b6608bb22b66486895340595c13a9b59ed5316b3a6a8d27e86a796a8
 SHA512 
b69b534b8398ea2cf8578dca763736c6ea071959c37f4c2fcc0ff5ea9f35cee2e88637567979211d242a04f2015fa3ba6765b5e2173a9ab90c69e5d67b02e9c3
 DIST genpatches-6.3-4.base.tar.xz 243812 BLAKE2B 
bcd9f63e6015b075a589becbb6246cb208f214f97f443a27258c103dabc2983de04283bd596c041f5c615dc7bed9d28032b4b9e1887ee4f2840dca3bb8506f9e
 SHA512 
3e6bf8f25f7f5ea54c795cfefea83010dcbc6480a054b69ac90d3187ecdb819d19d26e3df09e8c2b9f166e4ca488062672041e7130ac7c0984c0c34e786f4982
 DIST genpatches-6.3-4.extras.tar.xz 3808 BLAKE2B 
fdc95b7e9b191bc5eb19215cc1a381723242344a47d8e7a6ceb460d49fcbcabff2016a9ee0fde254e2461b54e145b2db2d5add045da1392fc86f1b11d2aa5c68
 SHA512 
f28b91dd378c42b1f170e29d851d8c7dc78b6b07243231b7b784ec596949abc8ade382025632e2999e395a28c3f38c56e2a439d5e62065af019cb25a21a29104
 DIST genpatches-6.3-5.base.tar.xz 341152 BLAKE2B 
19c68c1d0d56049a511ee2d8750d977135ea23190ba6f16f5b75fce668f990f30f7f91058ecb2259e7166796c9a31e52be0e00fc2079b6a28b8b59f5570f165f
 SHA512 
0ab9b37233031faf698a5cde904a3f10f4f0e121090145a625779872c9010f2fbd9b04223ef9ab2456a3caef22e8111fe6be68e7474e73de142609877d063939

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.16.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.16.ebuild
new file mode 100644
index 000000000000..74980954c516
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.16.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.14-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       https://www.kernel.org/
+"
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       amd64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+       debug? ( dev-util/pahole )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               riscv)
+                       return
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-gentoo-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to