commit:     d202d3a1bd2949b3cb4be9da238f5b535c206685
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  9 17:43:55 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 20:18:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d202d3a1

sys-kernel/gentoo-kernel: Bump to 6.12.46

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.12.46.ebuild     | 185 +++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9090fd790f80..49d42bf1c01b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -50,6 +50,7 @@ DIST linux-gentoo-patches-6.12.43.tar.xz 20956 BLAKE2B 
29333fc247ce5a1cc75ff70a2
 DIST linux-gentoo-patches-6.12.44.tar.xz 22180 BLAKE2B 
97b49825846827d29ca2bb313de8983f3dc3e18cf576a9b5bd5869bc38ebc42c8b61aeb7b6cf068aab918a58b48f024163ee6f3da448a4edbbbb37074a5b1397
 SHA512 
74292ae4f88746be65096a8c7025577b0d4920751d94f88417429e9aae91247e3aff7ce62b17b62503df8bb501a74c8f4e20c5c7ca5f4314549f21d977c97f44
 DIST linux-gentoo-patches-6.12.45.tar.xz 21680 BLAKE2B 
4f45815da949c681b4768665629342011910bd949309d643a1e225a035ca2a5d5a90e0ab9133a482f41018e9fbb10b33f145f8039cddbeaf5ba0aa293c6a32b8
 SHA512 
84f9d56e49ede8cadda0142f9ae23e7cf6b8fab4fdf47ce258d43d99537100c6d1c376a8f15482403b76054cf8d9f86dec126cd0edfd1bbbb0073f58af3b16c6
 DIST linux-gentoo-patches-6.12.45_p1.tar.xz 21996 BLAKE2B 
d0fa141b468267f77d3b0fb331c719277e754390edf343e6687c110a6332b575779d3214b77632c2ba368d254e2063e5c8f4505f1a594aff5041b7074d11a6b5
 SHA512 
cbe1035826a8f79259295594019c98c275dbbd774c815cd65165ca1d83dfa49e8a35ae568cdd5ff29d19c0e25570c066b5ee7c35221f5fd3e05b8e59896f0005
+DIST linux-gentoo-patches-6.12.46.tar.xz 19724 BLAKE2B 
edf0bc009a30dcf5d22c517bdfbab4ab7e4df3510e2102071fd24788d5cfc610434da2e92092ca5424e12e1676149b510f2de7e937be1ed96d0db4e2260ad42f
 SHA512 
dd9d7c48767f3db0a8a6a33e8ffa9ecad4345044586d76de65d42e8985ef794bf7ab547852a1653bc1d66dbf4accdfc06cd5e35265cd2d2cccb0aafde21d8950
 DIST linux-gentoo-patches-6.16.2.tar.xz 85676 BLAKE2B 
31adfc6ebdfe2412c1576734351a6ff5bc0c1cae86e87f3cfbf555d07e8441c64bd0e31f3760674e931a510a9401935dee46689eeff6f5ee5c28029a889a40cf
 SHA512 
aa74585b4c71202176c851cc2b08569a752da58f5a43c5b1fb3dfd59db8ff016907985d448c51f4163b951a5bc500b81eca647e1b6a7c20ab7287292d4c2a3b8
 DIST linux-gentoo-patches-6.16.3.tar.xz 90080 BLAKE2B 
0fdafabbaf6ebcbb997debdc17b5baec5a7e3154902a9093891e5d839540c55ddcba94ba34af11bbc374badcff67d1e47999bc998e5b21168eb92b332438ea01
 SHA512 
83de7cefae3d9ad9d47ae49db4a8328725b7b44fbd4e854dfad2a33917eace57958e9e25d275c83a5d026c2391b529015ac840e2fa3f3cf13733e570349d25e0
 DIST linux-gentoo-patches-6.16.4.tar.xz 89184 BLAKE2B 
57ee7fcbbc519ff327162163b81f910ff90216b19b066acf7c873f69afdcba99f9d38be7c8998522b3870376441d8b3be5c9de7a12f8464bbaf597e18162a966
 SHA512 
b4c02d84b7023359e0f378459c31a6b0984d743a9415f667824295292f448aae185665c39537ca9fb8bbff3473956dd90419bbf42dce0b9eb3bdd1fa9465a7c5
@@ -73,6 +74,7 @@ DIST patch-6.12.42.xz 2666304 BLAKE2B 
7e8cfcb30f98202d7cf9e152be9ff31bb013b358f1
 DIST patch-6.12.43.xz 2759136 BLAKE2B 
a667414254b536de9d0158ceaf1e208241817352f237f914b2e6cb60091fa4db962d1d78b28d7131ffe967c293a06c97a056858b72d7710737d2c7f9fe1505a4
 SHA512 
44112176409936afbcd29690d4e097dc5a30052b9b6e8d91b293b51bcb5caca5e6f8fe998d3fd3bc9ed8f6ea36bcea05699a82a0bdd7f88e4a9a3907b6ae1d59
 DIST patch-6.12.44.xz 2834532 BLAKE2B 
812cb9e1a980a0ababa1a8a89e86798674c9fbfac401b1551b59d50f7df949c9ab24014b2d3e06b49f38b8da7af0df7fec112ef5b0765504d646c07bb7cfbede
 SHA512 
ac82bd5ceb75e6e0bccad3faf9f07c2a11415552efb5db40a65b50347974cb39bc4fd9f43afe3f3a5ac475bfcc767735d9e9eebc1def441b6d887269b23b94ec
 DIST patch-6.12.45.xz 2853180 BLAKE2B 
3d07c28085584c1e684680cf59b023293a604dd5e227f01ff02a5bb9026ddc8280701edf6f77b712792a24c5f4b93eae86dcbc8fff53a86496fd307e6f25739f
 SHA512 
1822808c6480bc506b0ea92f1e69ad1e1f2ed7c44865780db20327b6bf629150336a450f6c32fc05256e5d44de6a7430e6f14bbd8afc70e20ff3a871c7a0fb91
+DIST patch-6.12.46.xz 2894304 BLAKE2B 
4486d5ed39245d6ff97057f855ee30cb403c2e9321619b834cfb5b829d5446d150cc717c8769bf2cca793abc95f32eba0c4c2a8d2abe0df5c9033fbec1fe2de2
 SHA512 
1b6faebd78e4b062dca101796ada82a3f9d8697d0d0da1b7826ca377e5467f41c4f19ef5941ed4274e431736a89e7723a7c194e05180c755801385cea8d4a04f
 DIST patch-6.16.3.xz 404136 BLAKE2B 
3b33459a827feb8c31bdc5ef80e0a16d80c8555c8f6482aee2d4965cdf4072f172704498ff9bbc29a20a71400338a001e0fc23ed53691164012120c9200e32ef
 SHA512 
b4ca71e98add9b84a0f3aad3fdc994d225bf051d033290ebbfde208eb8044d5904278871863a3ffe927b6f2b45a82284dfb036b0198bc8d120530a64b4b6844d
 DIST patch-6.16.4.xz 541776 BLAKE2B 
f343d8d03d5b09e06fbf906df7ac6175726c5cef8f2b9db2f31f509785d5d6e2a4d6b5573e8f6cce818e08e6a21da19320e2af3b43207fbd549a738ac2455f33
 SHA512 
b71b17fdc8f25e4e4e05b364c31a66502a3e00e6e3d66808f9726098f1f2e315e3666aa69c6f164a6cf8f1c2c4359fcd620b0dd624a98d007da4bd34310b03f1
 DIST patch-6.16.5.xz 593096 BLAKE2B 
d31bf76e05249e8414b1df045eff96015b6b47b38aa36745fdca1ea3f5f2c6d552cb1a7eb9d57c3234d3ec069333cab5e0b87619232fc850881188c8f0f48465
 SHA512 
d146208501727047695524cd1e5d6c4b4e008e1d9e354ff49460b972a6dd187f7ce4a6891a7856b4bc31ead63299523253d8b03c6134c4a09373decee74a7e66

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.46.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.46.ebuild
new file mode 100644
index 000000000000..3eda944fafa5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.46.ebuild
@@ -0,0 +1,185 @@
+# 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 verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.12.46
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.41-gentoo
+GENTOO_CONFIG_VER=g17
+SHA256SUM_DATE=20250909
+
+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/${BASE_P}.tar.xz
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/patch-${PATCH_PV}.xz
+       https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.tar.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/sha256sums.asc
+                       -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+       )
+       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}/${BASE_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 )
+       verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PATCH_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
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               cd "${DISTDIR}" || die
+               verify-sig_verify_signed_checksums \
+                       "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" 
\
+                       sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
+       default
+}
+
+src_prepare() {
+       local patch
+       eapply "${WORKDIR}/patch-${PATCH_PV}"
+       for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do
+               eapply "${patch}"
+               # non-experimental patches always finish with Gentoo Kconfig
+               # when ! use experimental, stop applying after it
+               if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]] 
&&
+                       ! use experimental
+               then
+                       break
+               fi
+       done
+
+       default
+
+       # add Gentoo patchset version
+       local extraversion=${PV#${PATCH_PV}}
+       sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || 
die
+
+       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}/${BASE_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"
+               "${dist_conf_path}/zboot.config"
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to