commit:     d232162118d48bc6663c5d3d0f708f8d8401faa5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 29 11:01:21 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 14:04:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2321621

sys-kernel/vanilla-kernel: Bump to 6.12.21

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.12.21.ebuild   | 135 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index ff95db24b715..5bc16e8dabe0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -49,6 +49,8 @@ DIST linux-6.12.19.tar.sign 991 BLAKE2B 
a3c9a37e9bb4059d01bd15fa3f8b6379e1988bab
 DIST linux-6.12.19.tar.xz 148001296 BLAKE2B 
71bf8a8d7f3583df9a54504d66cb50e60324dbcb95f8dc2d9b3479b41485c22dec0743fa272a516118df36d5d59e87220cf9007e1f1b51ecffe5a3f9b76c0e90
 SHA512 
cce6afef152b81daddaff0692d1d867778638934920700c6ef34b9063c72b438b5b1e273456a572cd5b223a67502faef32eec879c6374691ad9ba1df8d3a4603
 DIST linux-6.12.20.tar.sign 991 BLAKE2B 
5106d257e9faa7585ce99ec3e3662bc871dd5b477766cf7d9f800215a00696d703b10b4f8ec20d60c828b42a4c3e64cce8cf9b4ea17dc2d04b838e351ac2c3cb
 SHA512 
34ab0968d5227fb6b45ba5c819343054f65ddcc7dcf37d7c0010bd60a7d9f37ca8123ad82cc1430278eab1ec78e5145c2d44e4db25318f56a235bbdf15484b49
 DIST linux-6.12.20.tar.xz 148029712 BLAKE2B 
9d8677dd7dad0fd7c30559896bfd643dc39afe51087699016ecb515dbf23abec81be78d9772a4ce42a3106911a912c8ab6ef5dc8fe477dfcbe6e517fb4533533
 SHA512 
8dd823b657857a2dec65566e67ca70a181aa0304ed732c1a0bdacad3a6bda3ef726cab3b0d02ec7eaf082f51f17758d4df3f15493c1b51bfd736e4ece07baa65
+DIST linux-6.12.21.tar.sign 991 BLAKE2B 
42a56c7d87d2b3449dcf9c35bb40fdbabcdb8a49695eded323c7b4d77bc6909c49729113db42bf5dd7d832909d969b1c164666d812abb1e2d6657133380b7fb4
 SHA512 
f59b3a428aa9aec2899880c442885838cea35a43232be754c855ba51110a3efd4a50caaa12e476bf9cbfd86b3f8312d55a9abc395df29e7f74dc36bed7eb3066
+DIST linux-6.12.21.tar.xz 148042304 BLAKE2B 
3dad715ed88f08c680837f7f74d0cb759f1a50f597820a9885863fba48cc13b10d4efa65ad821c02cfbbd7f0b814f4498cf15f4274cd9249b49edd5a37ea0728
 SHA512 
14436c71264c8679a1a9aada6b64d916a6ac5ff5f2128b344e844bea41780832b9bb5c74ee7d0970ee84b02feff433b1003303e129ff26deaba705aff3608b6f
 DIST linux-6.13.4.tar.sign 989 BLAKE2B 
1825b5690bc923e217ebb2ee5f6dd05d6cea19f1b190f5ec52f23eab790bcea374824eb6ac797b6161e0bcdf7dfd343f53a95a87ad57c793f821eb79f1ceda0e
 SHA512 
f7110f08f96156482281b901042e95019741776005eb7fec29a4bbdeea0d4cbfa8bc625335453524c3b64d9a8f82b2dfe4da8d6a3119dba267e8d46de65ff605
 DIST linux-6.13.4.tar.xz 148494632 BLAKE2B 
2fe8e972e7de458fba6fbb18a08a01f17b49e4a2d31aa1368e50895a2698c6e1aaaf5137d0c0018860de3fe598e4ba425d6126ade7387ba227f690137111a66d
 SHA512 
d6e1fa891d4d62554020886c785e11d9ed982b236033b765471c47bcdd6026d33cd0fd9c83fd4ee9fee474d41e6e7e8079ee322bf6d3185d8bdda20cc9c0fd95
 DIST linux-6.13.5.tar.sign 989 BLAKE2B 
bd83850b70c5e8161e20b7fc21029145e9cafb90b4028cf4d84de33e0a911cd498707b9a15dc3f39c1874498ad083fb478af16bc87c585fb57e45f90939f4cb4
 SHA512 
0fa12aef17d3e527ec89b5bd8c66471e86b14688b98971d00142217d4797e6a751e88d9d2bf5951dae1b0cf4f4f92c1407b9b456ea3fb10fa45a8e722e8e7972

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.21.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.21.ebuild
new file mode 100644
index 000000000000..237bf2d71e7c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.21.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.8-gentoo
+GENTOO_CONFIG_VER=g15
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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://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/${MY_P}.tar.sign
+       )
+       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 ~loong ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               verify-sig_uncompress_verify_unpack \
+                       "${DISTDIR}"/linux-${PV}.tar.{xz,sign}
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               arm | hppa | loong)
+                       > .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
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-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