commit:     c1590f884e892b3a18d39445c63924872fc62337
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 15:41:06 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 18:13:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1590f88

sys-kernel/gentoo-kernel: Bump to 6.10.5

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.10.5.ebuild      | 153 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 60566c7236a6..3284861ef755 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B 
13309e86f5b16ff79797736ac91214
 DIST genpatches-6.10-6.extras.tar.xz 4056 BLAKE2B 
746ea837c1ba5ed7a4385b2f60be08986ad43f0c2eadebbda940d4cc2f7eabdef830459c55c183a68b63be318af661a8bffa25bc5da37628efb1f59987724c8e
 SHA512 
63929e552c0e648245f8b7af72478bebf3a19be2f9aeda2d37e68b02611a69bb171338228c1c1d46b352236f63c3b514e24ef4f0260e0477d487d02ffd99ddcf
 DIST genpatches-6.10-7.base.tar.xz 309388 BLAKE2B 
7c1b7e7ef111b090d54c616d2e4df14d2f914c0e5b5a947c27781c237de9ce53d42c4cb9c6b55b3e0711485a0f28bcdd484babb0ecd2d3e0d508712f3e5e8979
 SHA512 
828c4638cf3b29e2513bdc418cce2ac567b593a9c2b710c564c49193790e5268e2be5a37d341f3b2aa08a59d36f59019021d3d5fc5a2ec7fd4f45b643d686801
 DIST genpatches-6.10-7.extras.tar.xz 4060 BLAKE2B 
b07e59e37eca5c1a3fabd0d062c67f35f404244f93ae10b423d6849ff4d141fd184619d93551014ddc02db0c3379b8b2c486f71ecc798c1a53c20ab5a5a6a426
 SHA512 
0938b6a622b8b9e6e251fdf7689d972e1aa0a78ebd1cfabb7686298286f87bf9f0e30fe01f64205f775d90e870cb2cc3eefa73b49100a82ae01a6399376d6e94
+DIST genpatches-6.10-8.base.tar.xz 391536 BLAKE2B 
636997da732776bccbfd9dc0543a452bd38a42876bfa46b4ec97034880fab320017de72c50b87ee2e7813d1231babed5b2649e65f603dd65dc4280f119ba94e5
 SHA512 
f2b23a7a244c8cead4b5644d3c7b34bd1ac890e8822f673a663f44902bcbf85b00ddc3dee25664636f3ccc6893bcc89358fbe7733d89c8b2f681c4e6b6076da2
+DIST genpatches-6.10-8.extras.tar.xz 4060 BLAKE2B 
62f1c87268953d69bc08bb9a601d8b446c31c5d76a50d0c3f67d8048b24e1fa5327fe5ec8cfcad95bc83a39dfe7daec856a23775e9f797241cca30fe8935c13e
 SHA512 
a2925de9fba3d5bfcefa81a01ddc919e8dda835a433b952deb455a1c7065f4272cb26e363408b2fa92ca9b2039fb596a4b99395546b04b3ea96129176f5613e1
 DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 
3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07
 SHA512 
2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853
 DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B 
a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f
 SHA512 
9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
 DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B 
356a9a17f69416423c37c801e715dd4b03d1ebf02411a3e637e3790b4adba44db6c04f51f19a6da4ba420332cd5af1221692dcfc2ee1101825a5c8a8885c2e44
 SHA512 
e7a74df4659bdd54bf0bdb4aad8172bb1374aa563a19d28cf9643d034b59aeb55343ff5048d3aea42ddcd7561f0f723f951ab1f00c05e5ad88d20e70b7c3069e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.5.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.5.ebuild
new file mode 100644
index 000000000000..2bcdbee61cf0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( savedconfig )
+       sparc? ( 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
+                       ;;
+               loong)
+                       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
+                       ;;
+               sparc)
+                       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
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to