commit:     e92cb63d886f98aee9879e16116c4297e5314a22
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 11:02:43 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 18:21:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92cb63d

sys-kernel/vanilla-kernel: Bump to 6.12.24

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index caa2e99cc393..87405c5e5eef 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -48,6 +48,8 @@ DIST linux-6.12.22.tar.sign 991 BLAKE2B 
dc5c5e08369896f20648a836314e7e3e6b1cdab6
 DIST linux-6.12.22.tar.xz 148066504 BLAKE2B 
ef8cf11bb96e67f63e00566c5c9be38dd7d4ae642504b16883701b2c4f07afd9b36b73fe22df6fbb95b44768b46611ff0fc8b66db4c5fb9d7b6acd25df77ff7c
 SHA512 
ea4a9995bfb8baa647260daba7ce63f1e706a0b7ef74c04810382b97249d562ecf5d57d6c966c5fdf54542ef844f476a5d6676fe83c02cf7575a02caa63d84a5
 DIST linux-6.12.23.tar.sign 991 BLAKE2B 
a1e9718f99cde2a9ae82982f48dc7b23af0eece28452ee9ceb625d7e524f158b4d30c1667833811bfd9be8db389e6388eeefab9ae054410b0c8c89a82635a617
 SHA512 
d2dc76b4e6311a56bf88431147738610e218246ab324034c49a6dcb4d7f1fb8e6333942bf02d561d36669498355f21c7e83190d2cd9d56ada3cb646716bf1ea4
 DIST linux-6.12.23.tar.xz 148058060 BLAKE2B 
794c7fead01abd6e8e93e8f22e4b1c7b443bff8749445a4759d323f20534040cbe827d42ab47bd9af57f70309f91c92577ea655ed5de2a4035dda9aea8096add
 SHA512 
c972c81f985c5470d4c1b4642214f9ddcb49cecbf1e6a99e52a24ce480d06d7ee7ca7f0dcee7bc4fe00da2f41f0bec4fcd569b6034522845ba5f0ad9ea0e1958
+DIST linux-6.12.24.tar.sign 991 BLAKE2B 
021cd27ea317df56c27ea260b122acf99a3993e0e3945fa9e8138ca6f39ee08ba3fc5da461057030c7225afeaf49df73844bea8ba70c83782ee7b334202b5fd4
 SHA512 
819eb2b617c6f7bffade23f32d88ee3757e3d734ffb167fda85acb27ecc12cc4555d4552032bc1efa26f4904697d064a4e0b82b70224d56c097d6a46897c687b
+DIST linux-6.12.24.tar.xz 148131344 BLAKE2B 
82cd7f004337ab04c27dcf325c8733681998e20431f5d152d2c985c2832b5e24837763d43cc8640f64b7b4b9d89561abd0a59abc48b7b0177f642ab23fe41dcb
 SHA512 
631f683593245f31871548556d4ccee8af9f3ef321267b45f924d7cca28cb5d38e75a5069012a14a7b40a7a1dea3d8821b4d14170a7e192453127b7df4500f3e
 DIST linux-6.13.10.tar.sign 991 BLAKE2B 
0720a44cb89c6dfdc12d02462d9fa02db42031e3795b6b7b7f0a78f1c4684d41fe857f251b9094a895d8e934a22cd950c50d419579a5e077ccc7fd9e6e3ca4cb
 SHA512 
c8b03a90208cd48833814a82ee3a709014753a11aae956b33f8beb814283fc1f1609479828adc5904105cfad970647922c4b88eb31010125b482c0fa5da69144
 DIST linux-6.13.10.tar.xz 148573160 BLAKE2B 
7512ff46ddbdb3fba188ad23d2e42b6ecc4d44f15212db6c2acb8d54b3909ba413410a37e269583e606cc2f5f41f08a0a50baac599c1e13b7107a521a3835b63
 SHA512 
c7272838b40507266bf3bfc0adbf6151225ddc2f71c8844ffd1e444c67a49e2349c814d8ec6ce401ba0eaa1b7761c286b3c431a7341dfebfb7a40b4cba599b87
 DIST linux-6.13.11.tar.sign 991 BLAKE2B 
8f1229f7153fe69cede66f278720c5cb6e5f4bab26bd0162faa147d651edc397e9d7ee8c7fb5090763ba4f1d1400ec98dad5ba59ad104b6701de8476af5e7bc7
 SHA512 
9778ee3193efa159798f2affa061da71c26adc569b2b3eb3e82972c790370afb8f3b111849940f36e34fe5087a1c9572a01e1d1d3c1a46fdff89649d1498439c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.24.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.24.ebuild
new file mode 100644
index 000000000000..d5a250429777
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.24.ebuild
@@ -0,0 +1,136 @@
+# 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=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