commit:     3f4d5aeece9b8a0ad6cb1212359c763785c90768
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 27 12:42:48 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 16:04:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4d5aee

sys-kernel/gentoo-kernel: Bump to 6.15.4

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

 sys-kernel/gentoo-kernel/Manifest                  |   3 +
 .../gentoo-kernel/gentoo-kernel-6.15.4.ebuild      | 151 +++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index fa3e370b02df..c3874bc8b076 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -40,6 +40,9 @@ DIST genpatches-6.15-3.extras.tar.xz 4060 BLAKE2B 
99139d97cbe49b5f8a970818d6c394
 DIST genpatches-6.15-4.base.tar.xz 295212 BLAKE2B 
f5cd4f9b45c452c6844c979f3cd028de6d51f365318e817c1abddf46a6628225b182652af05efea080ddd226d706f688437f93de3e39f192b365d02ce645f341
 SHA512 
e3520743b82fecff56bfa9c230bf03c14b99d49784ce9bcf32adf1a1d45cc355547cd2e45f431330ee0a02a530480288892ef15271b8cfe49dd384c33c17a04a
 DIST genpatches-6.15-4.experimental.tar.xz 74644 BLAKE2B 
632e4c554f8b3e97f2df21111788d74ff644d2489bbd3abd561338b68cc03ac03bb8b7bd96ba201aabb41a29f3db0c1ec8149812a6bfb35ffdc70f1bce7ef92b
 SHA512 
8552939da96913798ac665477ed1065c1df3982d3e7afdaf6ecc510abeb60f1700fd8c20da86ed40a3b180fb387e8597f95315bb39f389d32cf97e61a50603c2
 DIST genpatches-6.15-4.extras.tar.xz 4064 BLAKE2B 
77f646e96001a71b350ced4512ee9c6c63f656017fa2a720d11a4777577beb1e081780ed08dc89c5e2ddc4dfae699cc72fb41a7f5309f02737ff47fd11b2587b
 SHA512 
54284f9d5c506cea47afdf7c387d564085b49e5e4a6a7dc41ca97722ba70f60bfed6ec0f30a7a0f41e340f5af19f4335510e4898bf379f42670926549915a3e9
+DIST genpatches-6.15-5.base.tar.xz 463476 BLAKE2B 
49e319e29579d90a8a6848a7fa888b02966029e622eae1fe522be8518344c7bf0b356b21f36b052b5b69d629973b08d706c33cfd66b0707117dc7e39aa8db40e
 SHA512 
b7165a1f4474d5b67978467de195fef49b950cde46a7e30e936db047f9653cba64382cc90d8a0cdb0621ede37533d5662d01a19cd815b86a87b8cf1eca080dd4
+DIST genpatches-6.15-5.experimental.tar.xz 74948 BLAKE2B 
59719a2e09663fed8920df363e3b21787861e10d2a8699c5c82677509f55f2ccd998bca2271072efedb1e4bcec65288c9eab80ed1a0e782142815da56e511fd7
 SHA512 
f059d23a45edf19995a1fe708be5de5c7a1efd7cf1e880e46c98c3604c7ea2a932170d0b9019ac49a0181e9fa19a2d083a9b33b1329938375bb7c77055c4f69a
+DIST genpatches-6.15-5.extras.tar.xz 4060 BLAKE2B 
3e926d5600eb4f2943336af9be38f2f708dd6cac5ee0da59da7fb058f36ea94fa3091d0ae913a27d94ad652a1310131ed73aea81a2cf5f91cb82337d56d2334f
 SHA512 
c2aef10c75436d51eaf5d58876930f58d95c7479653da1c8de7eb210b5f15bbcdec0d08fb3456c173cc734a57af986c1485449e1bb3e3908fc173c0aa0bbe4ce
 DIST genpatches-6.6-101.base.tar.xz 5077712 BLAKE2B 
42eb11265006d12e5f67d25d58dcd1188ce6c8b7fe5cec8b176030f36910ff77da5a362e1bc41d3e52790c5e77a2a71adc57f5e107a5818651226ed98a27828f
 SHA512 
759cf775322ec77c85c6b4f5441c8a962cb75e13ccc8d73d366cebcfe75d97b688deed9c9c4e47257db349f950f33f5aa2a718fb2bc6a7a7cb7d75afe5b70d12
 DIST genpatches-6.6-101.experimental.tar.xz 6052 BLAKE2B 
a09a12087a756637a6db92e8ce464e7f875f96ce72f860ccb79ed212c1100c675decc2eef84da9c85c62dbdbe6c513969a8412626acd5c92a6432bc6a5fb0d70
 SHA512 
2e597b4aa49af109adc04642fe76d26e2083c36d0cbed4e518b76515cafdc0bbc98c307e6addca7edbdf666313657e9ce718c42f6d02d647d018c65626a21003
 DIST genpatches-6.6-101.extras.tar.xz 4056 BLAKE2B 
d83b765a55f25c4470ab6e5b3e8d2a00ed0a7dde2c5a29f2d68b18e6ae3f084cb653eecc47a9bb372b1ea9a65b727e6d9227f359547ca4a5fd70cc75aec41598
 SHA512 
516c38a41a9a3116b71729c44b3cdbe3183afb8f061e1b860d11bafa37415663807d470e8a9b4a35366b297a2946143d1393e46c6a2f755de82ef8f769121d1e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.4.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.4.ebuild
new file mode 100644
index 000000000000..ff1af9b4e4c0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2020-2025 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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.15.3-gentoo
+GENTOO_CONFIG_VER=g16
+
+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
+       experimental? (
+               
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+       )
+       riscv? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-riscv64-fedora.config
+                       -> kernel-riscv64-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 experimental hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( 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
+               arm | hppa | loong | sparc)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               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)
+                       cp 
"${DISTDIR}/kernel-riscv64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               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
+               "${dist_conf_path}"/6.12+.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