commit:     8f9ed1db3e570af58f7da23b22066659277dbf01
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  6 14:00:30 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  6 17:49:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9ed1db

sys-kernel/vanilla-kernel: Bump to 6.12.36

New release using base source tarball + upstream patch instead of
fetching a new tarball for every release, to reduce distfile space
and bandwidth use.  Use sha256sums for checksum verification.
Sync architecture support and QA improvements
from sys-kernel/gentoo-kernel.

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

 sys-kernel/vanilla-kernel/Manifest                 |  3 ++
 ...2.9999.ebuild => vanilla-kernel-6.12.36.ebuild} | 53 +++++++++++++++++-----
 .../vanilla-kernel/vanilla-kernel-6.12.9999.ebuild | 19 +++++++-
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 671e0167122e..1cfdaaa6b2b7 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -14,6 +14,8 @@ DIST kernel-ppc64le-fedora.config.6.1.102-gentoo 218278 
BLAKE2B f4dda4430e9801c4
 DIST kernel-ppc64le-fedora.config.6.12.8-gentoo 241851 BLAKE2B 
e7b8833572348037d7af2ba1f9671e8010276d853e0d85b8a175c0dcc5c212c57c7660be54a7ba2621c427cc8120acbeb1063a1c1a1c293894ebe1d63921b684
 SHA512 
7a81fe1c4b1d4fb9f2d68846882a8869c0888c8fa764ec41f41d27e61b7a69825ea8ceba2209b40deb7c0e8f4bb2c5d81226a4f28e7ca8aff4788bc7a3292194
 DIST kernel-ppc64le-fedora.config.6.15.3-gentoo 245534 BLAKE2B 
83c0865e7c813b67df376de3965686787c4ccfaa9be0888cf8bed67bee6efb2003b6cd0111f6debde9ef510d29c5550e6211c1eb9f1dc8f5d85d822ea0af2e15
 SHA512 
f98cf1b9eda96e5238a27cd7ff284c1d8515955faa4e53e38cfe8eb09e091a7e43fac132b8439398d6bee8b2a1b1fc2e80058aad63ae0248842d2f9223239d3f
 DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B 
d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5
 SHA512 
b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
+DIST kernel-riscv64-fedora.config.6.12.8-gentoo 245234 BLAKE2B 
802218a7610177426b813a715ae9b94e7ca2f2d8d9f08124208a8cd122f1a7e3ed5b1cd8a7e227a21a5cb7341554640fac321cb690fecbe9de78e7d8929b5847
 SHA512 
cc06482e7c08704fbe92d0f1c0e2f7c7469953119ddf43c0bf6a4f2fde55d0ad8b6b326bfa3ba8f01c528fc94ee14d889f93427db02a97ac8a26e8b9a0ebcf91
+DIST kernel-riscv64-fedora.config.6.15.3-gentoo 249691 BLAKE2B 
f0923c6bc802d2a8abbcd43593e95a52007263862fb2a08ec31b567f48d3b539fa2f6eba42dce0873f1b06bacb9db9b750c2586715503716d33fc6e3f0218bc8
 SHA512 
16b9cd14f84b0b4b0b18f458c4bd7a440b84d52702e1f0df1ee9fbe43527978026615b9eadae908cae8bd4cbf914621906389eff9daa9d023ae0b649d67851ae
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 
0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c
 SHA512 
b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.6.1.102-gentoo 228685 BLAKE2B 
e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124
 SHA512 
42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.12.8-gentoo 256210 BLAKE2B 
f14f7de8ae573561824df47cf94c3c0ce52a820456ebd0e618e4c1e7f5454b7d3f6f86c559a3cd98dd94c55aaeed397f3d0cee6b0e37cf6b47d3aedd920a9dea
 SHA512 
ea87b4b45c78888e02d0288dd5844cf2d97a14e251b565c7d6451a0e62fbe0dbef38f46715467af2f869995d6bbc8be61d5b70476a86d607a5bfa27fbaf36e92
@@ -42,6 +44,7 @@ DIST patch-5.10.239.xz 6751008 BLAKE2B 
f3acc8f5466fedc9d4aa5307067d3b0a2c061bf8d
 DIST patch-5.15.186.xz 6915404 BLAKE2B 
889614a7f12f423ceb961537ade85e339dfe8984fc19794ba80f7dfe1e3f26af62e58925291df700533c47d3e4e5018d5fe940ebbc429d1013ff4205751601c9
 SHA512 
5ca0df20992706d5a7a1425bcbc137aaef9abbb23bdf9d35375aeaa952b85fb6d262aaa858605c2dd5797f1e1c3af9cdff4fdb3c2acba9965efe7f98400189eb
 DIST patch-6.1.142.xz 6246892 BLAKE2B 
4e2f25b204d51b618c988e8cb185b7c5990f0ce42af4f73597bf184012e27210bf503493b520d0a795ce1a531294c01ece34ab6de9dfa2fe54bbeef267b07802
 SHA512 
08091dc3115334bbff7ce4f5ece794fd0f044e78b6592c611a4e6081e6f406f08605c21ab657dc8d63fdb75388c137a947a3afa521e2a486ace34b09e88a9e7a
 DIST patch-6.12.35.xz 2323488 BLAKE2B 
bfefbdc9bcc7b6e39f5d7e60778794b3ba5b3811d33828a9b07f91b672894ae7be61829673c0a7b000762b50d740108584619cf3e2abe14385e9f3313be493f4
 SHA512 
30c49515ce8e7da45d29c027348f7a569cefd49f63e1f0468d1f4ee0e2de119cb515be40d816aefbe79e3f937672e214b6fb1bcba2a953ac0b0811f8a4585c08
+DIST patch-6.12.36.xz 2388056 BLAKE2B 
9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498
 SHA512 
4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f
 DIST patch-6.15.4.xz 453596 BLAKE2B 
8f1fee18f5f522c93ddbf1608f432bf43d3662e137cc5e9c9ecf8da626732ef448ad14a1714c29b1abf341a2e1ab8a22de76a8bec4dc552f39b04585c42bbc3b
 SHA512 
341e642a61563dc1ffa4434f27fb91c09f70c1f116b54b2c5bc855e88c2404cbb9f983dbf3f7adf2328c29abb0a5c5dc88056a5c782820b94045a865b959fa12
 DIST patch-6.15.5.xz 538604 BLAKE2B 
3771e14cb95010a9e553191af6888fa26dd5f1084c16a1df3aad97ed2a03de97cf1af8562a1b7c0d1977dfba1f3973e03079278b72943ac104c4208e1eeed315
 SHA512 
ff35f126fc24cd9fc2ba7dafb10e2c4dc4643a2165893d6dd07ce0ab49bf33d4b67ab33b32875b74371749b5e6f93a061114c9837bdb48203d50b5ec55db5a65
 DIST patch-6.6.95.xz 4545076 BLAKE2B 
469b988b7ab414ca657b69079a3452b8785aa633955325776cd98e1ef4f3c0f2f7f9c00395f4da0153d9fcdead3392ab23c9f24b0c8dcb6d33f54463b187e805
 SHA512 
21dad3b47ea6047f9817907c085242dbfc77b2e5215ab365798771537465decabde4924d9b2f3b924886ded7b3bb29dd55b9e11253c5e56bbde3c6475b76d60b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.36.ebuild
similarity index 70%
copy from sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild
copy to sys-kernel/vanilla-kernel/vanilla-kernel-6.12.36.ebuild
index 731260baddd0..c43624f715d6 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.36.ebuild
@@ -6,12 +6,14 @@ EAPI=8
 KERNEL_IUSE_GENERIC_UKI=1
 KERNEL_IUSE_MODULES_SIGN=1
 
-inherit git-r3 kernel-build toolchain-funcs
+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
+SHA256SUM_DATE=20250706
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
@@ -19,8 +21,14 @@ HOMEPAGE="
        https://www.kernel.org/
 "
 SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.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/sha256sums.asc
+                       -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+       )
        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}
@@ -33,42 +41,62 @@ SRC_URI+="
                
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
                        -> kernel-ppc64le-fedora.config.${CONFIG_VER}
        )
+       riscv? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-riscv64-fedora.config
+                       -> kernel-riscv64-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}
 
-EGIT_REPO_URI=(
-       https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
-       https://github.com/gregkh/linux/
-)
-EGIT_BRANCH="linux-${PV/.9999/.y}"
-
-LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       sparc? ( savedconfig )
+"
 
 BDEPEND="
        debug? ( dev-util/pahole )
+       verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
 "
 PDEPEND="
-       >=virtual/dist-kernel-$(ver_cut 1-2)
+       >=virtual/dist-kernel-${PV}
 "
 
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
 src_unpack() {
-       git-r3_src_unpack
+       if use verify-sig; then
+               cd "${DISTDIR}" || die
+               verify-sig_verify_signed_checksums \
+                       "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" 
\
+                       sha256 "${MY_P}.tar.xz patch-${PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
        default
 }
 
 src_prepare() {
        default
+       eapply "${WORKDIR}/patch-${PV}"
 
        local biendian=false
 
        # prepare the default config
        case ${ARCH} in
-               arm | hppa | loong)
+               arm | hppa | loong | sparc)
                        > .config || die
                ;;
                amd64)
@@ -103,6 +131,7 @@ src_prepare() {
        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

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild
index 731260baddd0..a75da38284c8 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild
@@ -33,6 +33,10 @@ SRC_URI+="
                
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
                        -> kernel-ppc64le-fedora.config.${CONFIG_VER}
        )
+       riscv? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-riscv64-fedora.config
+                       -> kernel-riscv64-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}
@@ -47,7 +51,11 @@ EGIT_BRANCH="linux-${PV/.9999/.y}"
 
 LICENSE="GPL-2"
 IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       sparc? ( savedconfig )
+"
 
 BDEPEND="
        debug? ( dev-util/pahole )
@@ -56,6 +64,12 @@ PDEPEND="
        >=virtual/dist-kernel-$(ver_cut 1-2)
 "
 
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
 src_unpack() {
        git-r3_src_unpack
        default
@@ -68,7 +82,7 @@ src_prepare() {
 
        # prepare the default config
        case ${ARCH} in
-               arm | hppa | loong)
+               arm | hppa | loong | sparc)
                        > .config || die
                ;;
                amd64)
@@ -103,6 +117,7 @@ src_prepare() {
        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

Reply via email to