commit:     18f139df461cfbdf13b3165318dfff909e824f61
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 13:13:20 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 17:02:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f139df

sys-kernel/vanilla-kernel: Bump to 6.12.33

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.12.33.ebuild   | 138 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 0530491a3b6c..f269cde9126c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -39,6 +39,8 @@ DIST linux-6.12.31.tar.sign 991 BLAKE2B 
360ffcd1d8649cd65c0186b0de5ef75faf699363
 DIST linux-6.12.31.tar.xz 148137524 BLAKE2B 
5738a200674cb5126f0373dbcdb1421ff32da84645416abfb8c45ed7f13574f06b77546a7ce908ad9eea6174eec34e5e3964d52530e4d3993747270208ad109f
 SHA512 
9e70e7e8ef4681e0f1ec908a31f74c5632690ef4b8b45331c46c71f9c89637134b8fd3b06ef508799da20e03ebfdfbbdd8ba16f85eb21f76f0f96ccf410543dd
 DIST linux-6.12.32.tar.sign 991 BLAKE2B 
fc79930019912c676e4840bcd81166e4256484e23e958c074482baca3248f6359c185fbe46026af6f14b4baae2823ab5d60317ded414643790d00002190c8452
 SHA512 
9c68216e483282c93a8d56f2268a605717ecc2527c8d182cd284fb583612a041ab81492083d309ed778d1c02ffbdfa21e78844fdfbbc918a800457b4c0b4c326
 DIST linux-6.12.32.tar.xz 148143484 BLAKE2B 
21142861062d4d5f5dca4db5b8c7f40c613157727ace43be55091f2f4b11cdb0b47de0f33a36814831591fde160b90953d53b1ee9046f27c82fceb7f6f3af4c4
 SHA512 
90c5e5e9e3568edbf0a54581cb9e0c93e60891a1e65a0a2ce380c9c8a240d5d5ea8c28b77593bca8c305474668f6b25dc7b965792e5790ddaaff368ff846c633
+DIST linux-6.12.33.tar.sign 991 BLAKE2B 
f88eedabaee9c92e6e60e82dbbd09a5077f4fb677cc25d9f862b0bcf9f69148cd86693d6ffc59567ed6baee2ef5a00a75c4e67f3e4662755f9ad5f2076012ffb
 SHA512 
82cc2b437639ce11ce222fbd0eeaf3e080792d75109a61848f26f9e46ba39d170f45a68a9fe9693f1ffac2e27a151115512cda8f48b5123ddfed854d63ec390f
+DIST linux-6.12.33.tar.xz 148174228 BLAKE2B 
988ce7b77ea3c39986de31e4e31cefc43857bc10399262a4b7dffdeec4b615dbed29642930709f26c05421d95ab2e2fa60ca2962abc51c41cac7bb5dc9e33ac7
 SHA512 
64dc74426222a4ac507d0e579d67a00d4b4b82f79fe6a23f62ae4b19e6a21b44554b6e57877718c35b3a4fef25391f335705aea93ed9662c941ce553e8b6b036
 DIST linux-6.14.10.tar.sign 991 BLAKE2B 
c25bc21dc872a740145add6964dc9dcacf10a54f4d9b0897078de8d07718d2b48156d7dd1c9f72a66f1e70abf0a357fb9c15fe53296dcf366843aedc2c542308
 SHA512 
c1a3cf1a73991193e1684d0baa1e71e8e3d06862f2494bd36e673483ea2a7e31f5fdb3c2e1d283a68634232f605e9b74f80f829f9b53a25b7618082b913abfe9
 DIST linux-6.14.10.tar.xz 149535440 BLAKE2B 
d94b0ca4eaf302d5b28e8dc7df680b1f6bf98c622d3b7785353597c3bb032bde75ffa7bbc9c6e80583e21c1f47bd4ba635489a1ee1aedbebfdde50223233b053
 SHA512 
f397fbaeb51fad2efc509f831342be64bb4fab2f46d1c905a127be6751582c311e10cfe58b0803e2bd22c64730db1c89bc09ed6986dd51cced2c3bad14dccb5a
 DIST linux-6.14.9.tar.sign 989 BLAKE2B 
e17258a5a1d046997884abb15b1f1fbffc5524abd04b528e5e0004f2b402d0ffced6a86bd7b0c5d6e3f795f9b400ccf2bbc9868d379da27875954a980045879a
 SHA512 
37cb22d24453ce5100924f4f3a060fbd8d56d7dd5f0ec40e4e610f9d71934127a970d9d0867a70dad6aa8a9f28d92e38b8a019c937431b5c8c85d6a909b645b7

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.33.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.33.ebuild
new file mode 100644
index 000000000000..016e2ab1addc
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.33.ebuild
@@ -0,0 +1,138 @@
+# 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
+
+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=g16
+
+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
+               "${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