commit:     f52fe6d1755a2d73b2bed77dc0eed022e12e83ea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  7 11:58:55 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr  7 18:56:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52fe6d1

sys-kernel/vanilla-kernel: Bump to 6.12.22

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 60d745543895..b25740175065 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-6.1.133.tar.sign 991 BLAKE2B 
94ddefaa66521930d67e039f317fb461e4a3f688
 DIST linux-6.1.133.tar.xz 135288120 BLAKE2B 
2da095003c655868d8b8cf1ceeb1018ea4ced9c3ccdf22a92e1c55adaae7f81f0a8a0b1953a526a305fc0f2a71c145b6a8d0aba8144a3af5b479503d8babd632
 SHA512 
46f5d09736afbb3ddf520dcb5973f71b0678491b3127464b9b433ffac76c1535b8df53ac067638a4b2e51340318b0cfa397fa1ee7d47b028b3694847e4a92ce3
 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.12.22.tar.sign 991 BLAKE2B 
dc5c5e08369896f20648a836314e7e3e6b1cdab6288dbda11772aeb75bb5309cb0fc5936cea6948a318620325a59a890936705a8f15238ec6f7706833a50aa11
 SHA512 
865fb5eba9e4e3f25dbbf45432e4781401a5c45fe5c25d9d1d5e2ca59bd76db085e1637354016a37c6b1aaa641caa8da7d2c3b2c201712b8b3fe8270615a7dce
+DIST linux-6.12.22.tar.xz 148066504 BLAKE2B 
ef8cf11bb96e67f63e00566c5c9be38dd7d4ae642504b16883701b2c4f07afd9b36b73fe22df6fbb95b44768b46611ff0fc8b66db4c5fb9d7b6acd25df77ff7c
 SHA512 
ea4a9995bfb8baa647260daba7ce63f1e706a0b7ef74c04810382b97249d562ecf5d57d6c966c5fdf54542ef844f476a5d6676fe83c02cf7575a02caa63d84a5
 DIST linux-6.13.9.tar.sign 989 BLAKE2B 
f8ab95338c192a6aedc6d09e2e32d1ed43978f816307a075dea9d5453ba79425473676f63b6415ed508b54f6fa820274613622d608cdc5b4ccc825f023615c48
 SHA512 
dd633d38f4a98b7408bdafc6b68cccd4a0cb397074d5d8e934ed62e7c3d7b11fbd208c9d6c0c96c4d200f4a3f3dec5d9f6c687381f683439a11ed78ef7aa27c9
 DIST linux-6.13.9.tar.xz 148565212 BLAKE2B 
ee5bd7f15270ed56d7c5bcccbc6d3443e3b9454b1763a727434080f7a2183f705e8ded262c34eb263c591dd56b0a38d2e44248fba1d647691376e86a52464a12
 SHA512 
541aeb5100c294e42175826704c92d596c44aa91b980550b2ab4c8d4c9534bc502ae2d01b91e3018c52aa8e25ae13b7b2b5950e90f391d664ee3fa7bca4bf3c8
 DIST linux-6.14.1.tar.sign 989 BLAKE2B 
ace2caf28ed70adfea7e7d5a6832231fd89bffed329d32f6583b3ccb47f050333e2359024812c16d6210e2f5a6ebeb78e5df3b019b8a714597b3b91169c60fc3
 SHA512 
0eead1c8afd12baefe4fb34b2de0d07366528ac24e7def4823ae5d13a9db15e35ea550b36d0d70bc1b924619957db7078508bae8022591ff3fe68a532ed37d97

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.22.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.22.ebuild
new file mode 100644
index 000000000000..237bf2d71e7c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.22.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