commit: 50f0ad9e7dba5e60fa63c9f9d17bdc9cfb0a3690
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 17:09:33 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 29 20:22:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f0ad9e
sys-kernel/vanilla-kernel: Bump to 6.12.31
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
sys-kernel/vanilla-kernel/metadata.xml | 5 +
.../vanilla-kernel/vanilla-kernel-6.12.31.ebuild | 138 +++++++++++++++++++++
3 files changed, 145 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 46ef2c7f36a1..f25006c69744 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.12.29.tar.sign 991 BLAKE2B
7798ab8893087aa3e9d518563f12ac9bcefbbe8d
DIST linux-6.12.29.tar.xz 148111032 BLAKE2B
58bad7a5ac16e93d2d08c497e6e1192d1b984eac41bdc8af8bb23e62e9d4b77c0ac9d7a63f85c8f0f9ea8912987c1f8bd467d1c334f53822703adac5dd607cad
SHA512
af27224a20e877c6aad9d62531f342f828c28c0b00167944e86ef9e1bfdcd12816396fb5dd7c433926a70abf29aa4852124e7c3fd511e0d1e61261b46b6f9f24
DIST linux-6.12.30.tar.sign 991 BLAKE2B
0c1d79d3d179b7001b9d1a4b0babd6aae2817523e8788fff30ef27a40e63b4f862414c3135f581dbecf55d62f6bd1f58f730ee59f19ba38cdda8c9228dead674
SHA512
2bf644132927673396c652c9c6cb93d0a1260d4a03a6a19e0237b3a3c979e78f6c9f77e8e478045f45ea094477aa913aed1864d51122e1b54eaf2a22c8696db7
DIST linux-6.12.30.tar.xz 148069908 BLAKE2B
33f06b0cf1d1872442139bf8ebd0e6b782034bb9dd4cb897388eed2283a79019ab1d37362648afc3816dcec20922898b44ba5b344210bf4964569149a54bca1e
SHA512
ca225862bf9c7d7a972c68aa4f6e85d63007bafd790967c6d365a64cc57825b5cc6cfb69ea9501436d0fdf647b7a16b168a22f7a241a2591994f59c4f82e9ce7
+DIST linux-6.12.31.tar.sign 991 BLAKE2B
360ffcd1d8649cd65c0186b0de5ef75faf699363fa3a6a03c46ed2ff31009ca3fb0d6e613342f8f1223bab732fa6a9ca5991dd7197ac6c748709a997fbc42638
SHA512
0fa9b852f84cbca3cb3af10b1f003a4503d7fa9c17f38546fa00a4231ad2b03ba4cec4cd540f4266b405bd17b12278411640d1b80947e31fa10a8afd8f60dfbb
+DIST linux-6.12.31.tar.xz 148137524 BLAKE2B
5738a200674cb5126f0373dbcdb1421ff32da84645416abfb8c45ed7f13574f06b77546a7ce908ad9eea6174eec34e5e3964d52530e4d3993747270208ad109f
SHA512
9e70e7e8ef4681e0f1ec908a31f74c5632690ef4b8b45331c46c71f9c89637134b8fd3b06ef508799da20e03ebfdfbbdd8ba16f85eb21f76f0f96ccf410543dd
DIST linux-6.14.6.tar.sign 989 BLAKE2B
6056ba08a6652fe56a2be2312166b0430e2a0de9141a896af332202fbf9d92d1315501d0ece43fbc9938a5bf819f0c7b3f8e270d9f7f155602c089e7f6e21685
SHA512
9419afe7fa3fac0443afff1d2a7899edb50a1eb345d8ec7f361671f1a34a0a2c1cce65ff2062cfa8748ae42709e12ebc1d29215a74ad116dc1ff743a39610b08
DIST linux-6.14.6.tar.xz 149475048 BLAKE2B
dedcadc0b7506f620da3ac849446539e83d694f0955d5417e063b6680d53ef8993eeef40562ae8dae9249a21bea9746093f8873a360dd74f6b139fbafdd7b9ac
SHA512
092cee673c116dc737e00ec52da58475d039dd2e8f9cfb8d645971e754862c0042146e4011a2854f0bbe3ea8f78ce1aef11cff66a471f3daf3f467ceff5987eb
DIST linux-6.14.7.tar.sign 989 BLAKE2B
7ad0b481458b8665c45efeca16356b06e6378aa10d6bb06810addeb887a0eb3a639d3503d82b99ac09de61716cc5114306ade154ff132cc6b3ed44721f2f50b7
SHA512
c026b4b7ee3e9e57e6e516980439fa9b2b61912d2419dbf00a43eba1e42cc7ae34e089800f32704c7233aee34e7cea0dabb166dc9e41c51faf618c9efc418a6d
diff --git a/sys-kernel/vanilla-kernel/metadata.xml
b/sys-kernel/vanilla-kernel/metadata.xml
index dcee5ac96edf..7bfff2411c49 100644
--- a/sys-kernel/vanilla-kernel/metadata.xml
+++ b/sys-kernel/vanilla-kernel/metadata.xml
@@ -6,6 +6,11 @@
<name>Distribution Kernel Project</name>
</maintainer>
<use>
+ <flag name="generic-uki">
+ Build and install a generic initramfs and Unified
Kernel Image,
+ this is intended for building binpkgs with a
pre-generated UKI
+ included (EXPERIMENTAL).
+ </flag>
<flag name="initramfs">Build initramfs along with the
kernel.</flag>
</use>
</pkgmetadata>
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.31.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.31.ebuild
new file mode 100644
index 000000000000..016e2ab1addc
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.31.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[@]}"
+}
