commit: dadca85f2238bca9e7732149160ddcf3caf43f27
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 5 09:05:41 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 5 17:27:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadca85f
sys-kernel/vanilla-kernel: Bump to 6.6.93
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 ++
....6.9999.ebuild => vanilla-kernel-6.6.93.ebuild} | 33 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-6.6.9999.ebuild | 4 ++-
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 11824fef6418..0a13ba699e42 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,3 +32,5 @@ DIST linux-6.14.9.tar.sign 989 BLAKE2B
e17258a5a1d046997884abb15b1f1fbffc5524abd
DIST linux-6.14.9.tar.xz 149501424 BLAKE2B
4a675b88d7ddc8aaaf7258af95915ccbc8a09b6b7f5d10c865fc6dce3254aecfd2f72110be898fb6bb1abc5658c3a35758a1b0d90237de922f538613091d46b8
SHA512
2cfec217ca4fd181f9e69bf302f7f2807667536511f5085feba00b51a3a1f4bbc0bb96acada2eb1bfd0a8b584dfa9b57f12aed07a416a1085eedf8866a03f9c6
DIST linux-6.6.92.tar.sign 989 BLAKE2B
a953fefe6029d3691c4dd8d14b3951ad2edc7e459ff31d9a7d4c68c6d58ec523a39d0f0b3e53c8b0853993566cea6383ad8d4c9ef130e24ef06655dd42c8d271
SHA512
0763acc35aef645f4fefefab767420cc75cd852bd1d458e80af37d400a2af6eb169f5e9710cf1db10ace5ed89b13da339b1aa9e7520f24b4d73df83f43306eb5
DIST linux-6.6.92.tar.xz 140596892 BLAKE2B
5c70c904ba024ae6e9886414c6e25a38b70b54449a798ebb4a72cd702edc6269eb867833bd90e7631e9f30ecf6dad3d64e8bb8db6d0c877f3416a9c738ea3f11
SHA512
3399da69b892ba80d041ab7c25714ea5fbb73d3fdf0f616c79a58bea861af8796581444859a28773ab0ab1cdf1147f7e3dfc9b0f048d210f92ac45a288823830
+DIST linux-6.6.93.tar.sign 989 BLAKE2B
5983d746896148f8c7da680e838217b0f59aff1705e5b4312b63f96140912c05428c8b4cafa4b1c0813724c04e1d04c69f98ffc3eb53fc6a06baaa6be9cf743a
SHA512
1bf539b2972184cf28b50e3e4366079bba7d71bf08c7afc6636848bc0a626785d918c1b530cfc16da68c201da4fff6466239f78e93a362693332ebf402a150a2
+DIST linux-6.6.93.tar.xz 140532064 BLAKE2B
6539b362f93a0c0ce2004f9a5d1dd89c96e07789cf0015784bac1f4fc91138db7c2dfa5797d0157cf5113355b939aaa08a83c1a938fecf7e8ff6807cb2ceb31d
SHA512
92c99641380b2ee8968f029daab3c37708b59bd925d9795549d5710f2f153161aa1d797bcae154079ee1efee1118292a127a3b6c1ced97e550bd31ceae69e114
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.93.ebuild
similarity index 82%
copy from sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
copy to sys-kernel/vanilla-kernel/vanilla-kernel-6.6.93.ebuild
index aeb359d03ec4..e80437e72391 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.93.ebuild
@@ -3,13 +3,16 @@
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=g15
+GENTOO_CONFIG_VER=g16
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -17,8 +20,12 @@ HOMEPAGE="
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}
@@ -36,27 +43,31 @@ SRC_URI+="
-> kernel-i686-fedora.config.${CONFIG_VER}
)
"
-
-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}"
+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-$(ver_cut 1-2)
+ >=virtual/dist-kernel-${PV}
"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
src_unpack() {
- git-r3_src_unpack
- default
+ 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() {
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 aeb359d03ec4..05a73ba2bd78 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
@@ -3,13 +3,15 @@
EAPI=8
+KERNEL_IUSE_GENERIC_UKI=1
KERNEL_IUSE_MODULES_SIGN=1
+
inherit git-r3 kernel-build toolchain-funcs
# 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=g15
+GENTOO_CONFIG_VER=g16
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="