commit:     6b084937e2b4d0c4677e671ab021b0b9f1e3ec5a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  6 14:10:53 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  6 17:49:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b084937

sys-kernel/vanilla-kernel: Bump to 6.6.96

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                 |  1 +
 ....6.9999.ebuild => vanilla-kernel-6.6.96.ebuild} | 49 ++++++++++++++++------
 .../vanilla-kernel/vanilla-kernel-6.6.9999.ebuild  |  8 +++-
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 1cfdaaa6b2b7..f894d365f8c1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -48,3 +48,4 @@ DIST patch-6.12.36.xz 2388056 BLAKE2B 
9912220c0126fda1c35446d57376ccca45f12dc894
 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
+DIST patch-6.6.96.xz 4574068 BLAKE2B 
047878c4c04057b9d2f342850cbc41d0dc326dc9ad7421500cefc6e8c32a3a769b0f069f6348d1ea0663cf8274e6048a52d900cf48cd18c5cfe3e9808c5133e8
 SHA512 
dce4c83f605f189c8bf2fe0c96118ed56d5d686a145605d125e532e78417076f84a7d85e7b8bdc71d7b3c0c7594a82403d7a9231e61f88ee61a05b43adfb98ff

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.96.ebuild
similarity index 72%
copy from sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
copy to sys-kernel/vanilla-kernel/vanilla-kernel-6.6.96.ebuild
index 05a73ba2bd78..01942df88012 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.96.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.6.12-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}
@@ -38,37 +46,54 @@ SRC_URI+="
                        -> 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 )
+       riscv? ( 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 | riscv | sparc)
                        > .config || die
                ;;
                amd64)

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
index 05a73ba2bd78..c3d749183a3d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
@@ -56,6 +56,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 +74,7 @@ src_prepare() {
 
        # prepare the default config
        case ${ARCH} in
-               arm | hppa | loong)
+               arm | hppa | loong | riscv | sparc)
                        > .config || die
                ;;
                amd64)

Reply via email to