commit: e91036c21062360e90827285439f46d9cec1393d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 11:27:59 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 18 12:49:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91036c2
sys-kernel/vanilla-kernel: Bump to 6.1.148
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 ++
...1.9999.ebuild => vanilla-kernel-6.1.148.ebuild} | 39 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-6.1.9999.ebuild | 5 +--
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 283347317693..f656f65b148d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,4 +1,5 @@
DIST gentoo-kernel-config-g16.tar.gz 5995 BLAKE2B
cddb80d45169749c707d87efd186f7a981534aab2479b6c51790008ea61e9f9feac35d0d74b95dc18281e4b81771e09f259a1d9f216f5d7f806fa7cd6aeeb4d1
SHA512
f8114e645e1ab99e45703790b7e43c2fa9ee17b41a2265dccdd9187c122bf8b5a09ba918fbcf094aa899bb959f05d105ed474b75cdfa9a19c4d49fd138825647
+DIST gentoo-kernel-config-g17.tar.gz 6024 BLAKE2B
53ecea1c19cc83bc3f6e13ad3b2e813999a09e2b29526115480e8ea7b870da2f4728918713f8eb0b351730b2cdd9f75e7515dc99a9b34a4079f7d15a1cd78425
SHA512
a5a78da8027492a229f54bfbcddf4e8e14304280db01d856071a9eb1ed9cd86111254498c5546a9908d617a012c914e8ded0afad5bdf28e9f237e321b9ab0f63
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
SHA512
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
DIST kernel-aarch64-fedora.config.6.1.102-gentoo 252811 BLAKE2B
f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc
SHA512
41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
DIST kernel-aarch64-fedora.config.6.12.41-gentoo 288081 BLAKE2B
08273a34c387621d0ccffcc325a0a34b40e0a8fbe78f2429c8a9efc73aa05f8fb563ed53e5fadb25662089f23ebafb61b2d08f91ea00b073e67e702798255e9c
SHA512
58ea4f247aa9af6f7535ab5fe44dae2fbf286c7fbceeda86df532125807bbd4c25a89ddeeff4284592efefbaaef5022626abad7f1d1d64976e3040dc6e89251a
@@ -45,6 +46,7 @@ DIST linux-6.x-sha256sums-20250815.asc 162838 BLAKE2B
d5f8f57ce2d08a3d56ef4715ec
DIST patch-5.10.240.xz 6786568 BLAKE2B
1cb287b2c99bb403585cad3500a2de0819db40ea62a72d276c2b53d8637915cfc0350051bfdfc99cbb56a4e839331b7e11cbb2abdf6768a683d44e798ee5862d
SHA512
91f059de27701a33e5c4d40f2d3e982dc60d9dc14fa8cb6a0bbd49e4452195715f0093a563e3a1db1efa37b3a1e09e74b0a6d53f77357757ffd29374abcead19
DIST patch-5.15.189.xz 6955776 BLAKE2B
bd2bf4ad70014395ffac8874434b2caae7823b1b9999231738552d9f23a53547533c248fdb7fc4b4bdd60dc05e8898a910e3e94e6f5edae7ae96a66937f387a2
SHA512
8ace7d82af676b101ed37c382c9833193ab487cbb15b8444b92ccf8239e2c62bfb70ef7342ef6f694d71e8ac72b7db445d544e4ad285d9bd977365350bf155d3
DIST patch-6.1.147.xz 6320180 BLAKE2B
d109214e0682653ead5f62f5699d0bad2764bae1765789720d780e74afefadc39faf8e833df1ee4cc1436e4db5facbfc7f4ba8c3b657fc48aabda3ab84a4b540
SHA512
2cfd04771f982da4b65caf53cb944bf9ae2888a32005428adce383c408c35c72bec5d88e49670deb87011f0d6bc329e0a53adcad065aaa716ad5c8baffb2fddf
+DIST patch-6.1.148.xz 6365724 BLAKE2B
1f83c183389bbf4cedecaa22b49d6214d390f0cf92e3d7d7d56c00bbebacd55109f4886e667228ce038831207fb0b92f179303bc50acb85e36f40fda06cb2b79
SHA512
a0e0d1ede711c8a60c1dc2a260ef4d33866882952804418104c55f5f78f2ce69824c580cf48c92ffc5a74fdecbd6b9b74a739d9eb0bf7bdb36fab6a4456da0a6
DIST patch-6.12.41.xz 2584360 BLAKE2B
8cb7d77a45e79b186e24bc59be15d74f4e9ea4b7c7f7b5c81b82eaa9b1a8b88a7aabff6768471d905e24539366bdb85593304365726307e19bcfa41937764bf0
SHA512
b9307fafe443eb61b0edc624b2c9ab7a0206765eb614683e0f01d7f7fab04a729a91d92d67b8ace03208d6b63088ff235203e8fdfad27adc97cdbf7df872b3c2
DIST patch-6.12.42.xz 2666304 BLAKE2B
7e8cfcb30f98202d7cf9e152be9ff31bb013b358f12817bca1211816bc008171a1e0ebe09a3c67c3867f5b194dbf818ad4bd412509e6a44a25f944e16c0eedfe
SHA512
8b31be7c22a413e13a7b68086ac7f326d4741c2ae21dbd2ba3d62fc1b04fd393861b2801dbfd48dcf5b84651bc271434521b5e07876bd97afceae01034a7c144
DIST patch-6.15.10.xz 851240 BLAKE2B
c3397c8fe10b62ebe8e021864d456a1bec4eb52a0274e1c3fe365145191cbd39c2ca7cc6ab807b4df22936634fad67520dc978cc6df45a7a34e350e7a08ebb88
SHA512
4cb5a0848214b7cd76d587226efde3077c06359c0c8c1de50952b7f8282cb83195d477b46844ea0eaef039448f45fc1a07a331bac86efc6bae33cd4ff58bd9aa
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.148.ebuild
similarity index 79%
copy from sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
copy to sys-kernel/vanilla-kernel/vanilla-kernel-6.1.148.ebuild
index 828a8f49558b..e4984c3d711c 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.148.ebuild
@@ -5,12 +5,14 @@ EAPI=8
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.1.102-gentoo
-GENTOO_CONFIG_VER=g16
+GENTOO_CONFIG_VER=g17
+SHA256SUM_DATE=20250815
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -18,8 +20,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}
@@ -37,14 +45,9 @@ 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 )
@@ -55,9 +58,10 @@ REQUIRED_USE="
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="
@@ -66,12 +70,22 @@ QA_FLAGS_IGNORED="
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() {
+ eapply "${WORKDIR}/patch-${PV}"
default
local biendian=false
@@ -134,8 +148,5 @@ src_prepare() {
use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
- # 6.1 series: ZBOOT causes hangs in qemu tests, disable for now
- echo "# CONFIG_EFI_ZBOOT is not set" >>
"${dist_conf_path}/secureboot.config" || die
-
kernel-build_merge_configs "${merge_configs[@]}"
}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
index 828a8f49558b..92e27397b0ca 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
@@ -10,7 +10,7 @@ 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.1.102-gentoo
-GENTOO_CONFIG_VER=g16
+GENTOO_CONFIG_VER=g17
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -134,8 +134,5 @@ src_prepare() {
use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
- # 6.1 series: ZBOOT causes hangs in qemu tests, disable for now
- echo "# CONFIG_EFI_ZBOOT is not set" >>
"${dist_conf_path}/secureboot.config" || die
-
kernel-build_merge_configs "${merge_configs[@]}"
}
