commit: d7a027b59f5c919bb6cb8dffbf19be2391cdf3b8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 08:29:09 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 2 08:33:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a027b5
sys-kernel/vanilla-kernel: Backport verify-sig & fetch changes
Backport the use of sha256sums for signature verification and patch
reconstruction of final kernel tarballs from 6.15.4.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 21 +++++++++++----------
.../vanilla-kernel/vanilla-kernel-5.10.239.ebuild | 22 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-5.15.186.ebuild | 22 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-6.1.142.ebuild | 22 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-6.12.35.ebuild | 22 ++++++++++++++--------
.../vanilla-kernel/vanilla-kernel-6.6.95.ebuild | 22 ++++++++++++++--------
6 files changed, 81 insertions(+), 50 deletions(-)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index efeb52d365a4..a2bcc83f494d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,24 +21,25 @@ DIST kernel-x86_64-fedora.config.6.15.3-gentoo 262722
BLAKE2B d648db7e7f819ba70c
DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B
7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8
SHA512
c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
DIST linux-5.10.238.tar.sign 993 BLAKE2B
9527debd09d13e8930d65dc004e7eead857f8d1cbae1f895cb307dc8de9293cf11f7f8307517838237032ca29ce29f08e43bd2d438cb51d6dad8fcbee3f37d9e
SHA512
9852f8c24e489e71912e77fb67157018a6902223c8c49d04fbc01bbbf11e1e3f304a1191fbc46e122c018c056155d2ea1e6f8944b8541ae7eb5a9256540cfd7a
DIST linux-5.10.238.tar.xz 120799820 BLAKE2B
06fdf1e9f2a8c1bdf439efe827109cc3813df2e5f1335bae05cbcf25b146a84ea4da37b1e07cc2e95abd906d5ab519b23e482c6ecfb7bcc3985a843eefafa2fe
SHA512
89a65f3fa470e9d15c0c2d980e569e2de330ccaaa77ba695a670f32250df8955f55e5019fa0db930efd7f5f27e6458764b1fb770ca53d6c922c884c233d5422b
-DIST linux-5.10.239.tar.sign 993 BLAKE2B
818fd77f902212832c0d044ddba3e957e7463f263a0dc68edd9965d60d25376266af94d810952801b2be4f3f29ecb32816d94a1150735b079d586b7c0b0699c6
SHA512
8ee09f174125c6fa3d956039a4c1b0156e80ba4df7c880408de5d0f08c1d79a8fbfcb4df3672b9f15c6b5b557b13195d7e8b85a136f5c951b8ce01d9576448f6
-DIST linux-5.10.239.tar.xz 120796328 BLAKE2B
4e9b7121697b57a1f077fdc7e2a6a0b096155edf24e6d2ef00ba7776582d692e2058b61a924ab5e5a113a1da6153275b4799279e0061a3ebef482638a5c2f8f8
SHA512
23240ad431fdf11b4b621d4de2b27ff8ae3d9c8318c4bd56663fcbece5ebc36dba93964921240fc352230d1f75ce37b98d60d0b56ae0c037a5dfbd34c370620b
+DIST linux-5.10.tar.xz 116606704 BLAKE2B
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
SHA512
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.15.185.tar.sign 993 BLAKE2B
f1a316c468f6174dfca3522cdf09ceeec9f464297699682505021b01f39123e341e5b6ba01136218d05fa2943dbf952496362a09f10e4bf783aafd934d9f1527
SHA512
3404f45b4145c4a2dee1cc97cb86615ce6c2399fecd1587b26ef5e980373a7320fd7a9ee0722b94a3b862f565096cb1f6067b7963b37e6df59b7655ef19233ac
DIST linux-5.15.185.tar.xz 126752164 BLAKE2B
d9b79595711264b898b966c19bc3bb966afb6a8939e05f77d6c9d428a688903e861150b87b49dd3cbf62c6bed50a8c07fd32f9e481c02b15bd9b8caa1a31b120
SHA512
6067e5c16ea1594968d275b1305340131905c236f832401bbcf0f7d1cb1661d12e43596b3f71e99cd857905a83c20eeb772494ac13db6d943c0cf33e90744b25
-DIST linux-5.15.186.tar.sign 993 BLAKE2B
c736125bb053b7c5e375fbb6ff069da993083beee0afc610e075702097c20e55606b1bcc84155b51afdedf70d38ac1f2b70f39c8edc63c3bd50d04b712c6e867
SHA512
8de72969dc5ded8581a879b5130105626e081a789cfff605acaa284deddde3c6df9cf7969022558b2a1419a72f854f1d2f9479accfb4f005ea2249a8e699352b
-DIST linux-5.15.186.tar.xz 126743860 BLAKE2B
7499ff19c235a8f6e36185682c912e6fde83f762dab2c5b23e2ae7acf2f6d3cbf7c9cd80fa60acd5fbbe27abf17cbed8a1a774a4e359d70ea3bfce4b6eea8c48
SHA512
f2177ef2d13ddb7809b0b51c85c2e8659a54cb55c14621c46dd68ee902ed22b3c139456ec237704d1d6e873fd8d355bfe0556cb4de23267b82cebf906393022c
+DIST linux-5.15.tar.xz 121913744 BLAKE2B
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
SHA512
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.x-sha256sums-20250701.asc 362874 BLAKE2B
cfc373688f66a4eaba9c25d23530bf696014f415cd6eb0b72f6add51fb32e83198195b0ea10816954fa354b8ddc04f856f2c16674d734361fc59049a88bafe43
SHA512
00563a6ab6960b7dba42d0b010f052ee3a08e99b65a34ce928579cc755e997fa4d370b8980bc00cac2dc7e3540e10b934904e1293af38e2b675adcd01507386f
DIST linux-6.1.141.tar.sign 991 BLAKE2B
03016e9d69d4399c341287c70eff841777162a9f94196fa3f82cd438995f9bfe86c8970882d6e5efb7cc05076acf91e65e375c7a8516d759d459089784ce79c9
SHA512
1179ea885ceaab1437e4d1e8a4c6d0342e873a503991b9bf052ddbfaf80b9a4553ad1e45bca8279b8608e87e3d27100d81001513784239251d95ff2180df88b5
DIST linux-6.1.141.tar.xz 135312396 BLAKE2B
e373bc2d3090c06141772f4122bcc2880e36ce2569688b864c1d76c81443b51da2368b75b7229bb47992a10f78b95ec181c57f31ce5c9b815ceaefd003a6ba39
SHA512
f58f1df21889eebcd269fe2f4670e6ffc767100f713a58d202a9c02a06a257eda941c27e73b2dff6481cab7860dc907ab66a970e3888455d6d20fb69f2cc4530
-DIST linux-6.1.142.tar.sign 991 BLAKE2B
0ace7b311e88f2c11984294e160cfe4ec8630728b8516320df95f07ff38c399b979d4d74f23076706cd1df0b9cacb46c17abf65303e1c0059eae936a0d4b5018
SHA512
ee0bbdde923356147208b4d252ca65a2207eeb1e6051abd6a853b0ad7dd313987f710c0758ba37159c60e6d2f894db3b744c0e7908941c6872b179824e809c10
-DIST linux-6.1.142.tar.xz 135312480 BLAKE2B
137a08855678ea2ea6690e25508e1a3f03ecb4b95fa6b0d88c0174a36c9cdbf948bbf57a6686f6b69df69e4e49c54ec07eb570b0132490207e63a87ffb1eb3e3
SHA512
cc71281f1e2dab7fc86ee85cd94335cb8853e09441ac9cc3be90cdbc6651e81cd24b2ea9c359302f82e9fee8d0d26db681ce35070b4f1b0d0b56a9f723519be4
+DIST linux-6.1.tar.xz 134728520 BLAKE2B
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
SHA512
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
DIST linux-6.12.34.tar.sign 991 BLAKE2B
282fb87ed4b9482d56e4763c026fdac77769f89d0f74ccb955e6f247afb471d4d9deee8de96a0d062f400e0d8eb9650c02d15cb4b5a8eed63989052ef164c0e1
SHA512
9ef79e76cbd5f3905f23a4da94853b59b202b6612a04d456bdc4f96b408b1ec44e534f83bca14cacf5a200eb9fd45ca2a890c3ddecd126eac401116e75dd1120
DIST linux-6.12.34.tar.xz 148160336 BLAKE2B
a1527edf5ea06d55ad4468341d2e8cc44406df1edfe1a619ece86692e42afe7f5919ee051942fc9e70c47d79bcd4f0fc2e54ae32c79392702d8493596dca1a83
SHA512
b20afb64443656ab01d070405cda010a7133a157917ec33a9dec4957787c93ef9da9de277f08382be12ead66088d00919dc77a238e8618c443a9bf2bb7fa1224
-DIST linux-6.12.35.tar.sign 991 BLAKE2B
893a49d03dd208c6222ed921aa419e2a479f4955a45ee72990d9c812fcd84f0816c45a34705919d44fd2c8af05fb7ff2c5025fa6ec1f227280cd0a21d550d8a5
SHA512
ae13ffe2e00b6d23f9e0e23836f7415687e2a352eb6554e6ec167ac2e9eb6184ef1e0acbed3142257d9e4c6aaa96c716fa429a9302965503bebccb1c96a466b0
-DIST linux-6.12.35.tar.xz 148182928 BLAKE2B
87048a310dca3841f8ad31267e52992ac4c84c8e39b5500743ae07a39f52126c85ddba924f6aa478b8a3adc6dbbe9dbf5fa265b4587e5b7f1e970c11b150747c
SHA512
3697bf2c9525c8d11f7e821fa080d8c366ae751af02b471a506224002abe6b23b0ccf17d9694c7590c1b07002289eb19003ba8677bbb0bb09d54458495964188
+DIST linux-6.12.tar.xz 147906904 BLAKE2B
b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e
SHA512
a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
DIST linux-6.15.tar.xz 151168812 BLAKE2B
465596c6dc053ff3a3966302a906d3edb4f7ee1ef82f8c20b96360196d3414f5b1deeafa67b8340fcdecd3617280ba9b756d7073ad15c707865e256397b4af53
SHA512
d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30
DIST linux-6.6.94.tar.sign 989 BLAKE2B
ff090df5f609aa2784fe70b60e865c2057e332f4d2a9dc7b2da167fe77d9a285d2015abc99cadc63a9976907c6103de10d9aabe907e9f1c02f042f3894a24e92
SHA512
04d9dee0369b0b0de20215ccdd676401ec49a734232684edb697e6d38bc5e45368f77145b36d9302d44176dbbb263ac2184f4290fbf2b5311edee0fd770a3725
DIST linux-6.6.94.tar.xz 140571164 BLAKE2B
1fc4d4e72ab3d979343eb39055167df8f530c58b66fa5f16870f5bc33cc04f6375f569eef005d034d23c2c6a90e07ce9bd598bf0311df0579f80bfc7f9fa53b1
SHA512
c25a7f0bdc3c333fec9a9930884c0d30e9322a166e66de2949a81881f2c1d727916d7a7a78f2de5f2d2ab44f28149f2610c68dfb64382566891318b9b9f8cc7e
-DIST linux-6.6.95.tar.sign 989 BLAKE2B
95d7f0158ba938dc707aad8fe5a58106b80b95ab8014347b24c9fdf9e34e6e516934617aed5bc63065126d384cba8e2e1c4304c9ac9ffb88b1cf806156ad44cf
SHA512
4fe453c92d82d0f776ddcf4260334455d07c11cb8b3c9ba40c3d3655af647981003a56ed88bf480dff32da20f05160717cec71a75479730b13b3962ed45eaf3f
-DIST linux-6.6.95.tar.xz 140626236 BLAKE2B
6213ebd4875c57b94ee9040df96384b114d18e1531916de6c2940e753bfe5912c16ecfcee4e9a83ff2f15d0aa17c728380edb0edc4710c6656c5076face3a2ec
SHA512
a92c40b190d3e74c21144447c0edbe4164e22fc9a0b0fe31f65bfad90d36c29b41edb8704c4d3db153590f7d5d34759e4bba1d49388bc1739c7c09a1b77f6fdd
+DIST linux-6.6.tar.xz 140064536 BLAKE2B
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
SHA512
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST linux-sha256sums-20250701.asc 153342 BLAKE2B
3243b072afd76efc565d6b7162e4720e514f31ff495b771d7d123169628d9b2da9f550078afaeff45815f8a17563953bdba14de0f20c7e5caf8c5dc4cfdf3763
SHA512
a2ce48a3ea3d85d6ac29905c58f70ee4dd932e531ad660fab7dc5153890bbd9e8198b263cd7b2403b49ca65fa885742081fe512776091985b2c28eeb8b6179d9
+DIST patch-5.10.239.xz 6751008 BLAKE2B
f3acc8f5466fedc9d4aa5307067d3b0a2c061bf8df512919e69b8ec9b7aa2212e57b22ec0f41f5ab69be9af26947def48f2f5c475f285f331f2a9c5d670fac1d
SHA512
0a4d316c5e7de0827ebe071943aa67ddd8f7f04400a209969fafed39eb5cfdcd4b427034b04f340c4d889b5b87d85d5e75488892fe9bca0b13329668e33ed94b
+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.15.4.xz 453596 BLAKE2B
8f1fee18f5f522c93ddbf1608f432bf43d3662e137cc5e9c9ecf8da626732ef448ad14a1714c29b1abf341a2e1ab8a22de76a8bec4dc552f39b04585c42bbc3b
SHA512
341e642a61563dc1ffa4434f27fb91c09f70c1f116b54b2c5bc855e88c2404cbb9f983dbf3f7adf2328c29abb0a5c5dc88056a5c782820b94045a865b959fa12
+DIST patch-6.6.95.xz 4545076 BLAKE2B
469b988b7ab414ca657b69079a3452b8785aa633955325776cd98e1ef4f3c0f2f7f9c00395f4da0153d9fcdead3392ab23c9f24b0c8dcb6d33f54463b187e805
SHA512
21dad3b47ea6047f9817907c085242dbfc77b2e5215ab365798771537465decabde4924d9b2f3b924886ded7b3bb29dd55b9e11253c5e56bbde3c6475b76d60b
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.239.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.239.ebuild
index fb951cdd7894..54d507fd05f0 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.239.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.239.ebuild
@@ -5,11 +5,12 @@ EAPI=8
inherit kernel-build toolchain-funcs verify-sig
-MY_P=linux-${PV}
+MY_P=linux-${PV%.*}
# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
CONFIG_VER=5.10.12
CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
GENTOO_CONFIG_VER=g16
+SHA256SUM_DATE=20250701
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -18,10 +19,12 @@ HOMEPAGE="
"
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/${MY_P}.tar.sign
+ 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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
@@ -49,7 +52,7 @@ REQUIRED_USE="arm? ( savedconfig )"
BDEPEND="
debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
"
PDEPEND="
>=virtual/dist-kernel-${PV}
@@ -59,16 +62,19 @@
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
+ 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
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.186.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.186.ebuild
index 326396ce7852..3e7783da64f8 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.186.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.186.ebuild
@@ -5,11 +5,12 @@ EAPI=8
inherit kernel-build toolchain-funcs verify-sig
-MY_P=linux-${PV}
+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
+SHA256SUM_DATE=20250701
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -18,10 +19,12 @@ HOMEPAGE="
"
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/${MY_P}.tar.sign
+ 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
@@ -49,7 +52,7 @@ REQUIRED_USE="arm? ( savedconfig )"
BDEPEND="
debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
"
PDEPEND="
>=virtual/dist-kernel-${PV}
@@ -59,16 +62,19 @@
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
+ 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
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.142.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.142.ebuild
index 326396ce7852..2f91389e9264 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.142.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.142.ebuild
@@ -5,11 +5,12 @@ EAPI=8
inherit kernel-build toolchain-funcs verify-sig
-MY_P=linux-${PV}
+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
+SHA256SUM_DATE=20250701
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -18,10 +19,12 @@ HOMEPAGE="
"
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/${MY_P}.tar.sign
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/sha256sums.asc
+ -> linux-sha256sums-${SHA256SUM_DATE}.asc
)
amd64? (
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
@@ -49,7 +52,7 @@ REQUIRED_USE="arm? ( savedconfig )"
BDEPEND="
debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
"
PDEPEND="
>=virtual/dist-kernel-${PV}
@@ -59,16 +62,19 @@
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
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "linux-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
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.35.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.35.ebuild
index 016e2ab1addc..a8f677687b9f 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.35.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.35.ebuild
@@ -8,11 +8,12 @@ KERNEL_IUSE_MODULES_SIGN=1
inherit kernel-build toolchain-funcs verify-sig
-MY_P=linux-${PV}
+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=20250701
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -21,10 +22,12 @@ HOMEPAGE="
"
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/${MY_P}.tar.sign
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/sha256sums.asc
+ -> linux-sha256sums-${SHA256SUM_DATE}.asc
)
amd64? (
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
@@ -52,7 +55,7 @@ REQUIRED_USE="arm? ( savedconfig )"
BDEPEND="
debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
"
PDEPEND="
>=virtual/dist-kernel-${PV}
@@ -62,16 +65,19 @@
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
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "linux-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
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.95.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.95.ebuild
index e80437e72391..4de01a651e78 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.95.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.95.ebuild
@@ -8,11 +8,12 @@ KERNEL_IUSE_MODULES_SIGN=1
inherit kernel-build toolchain-funcs verify-sig
-MY_P=linux-${PV}
+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=20250701
DESCRIPTION="Linux kernel built from vanilla upstream sources"
HOMEPAGE="
@@ -21,10 +22,12 @@ HOMEPAGE="
"
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/${MY_P}.tar.sign
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/sha256sums.asc
+ -> linux-sha256sums-${SHA256SUM_DATE}.asc
)
amd64? (
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
@@ -52,7 +55,7 @@ REQUIRED_USE="arm? ( savedconfig )"
BDEPEND="
debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
"
PDEPEND="
>=virtual/dist-kernel-${PV}
@@ -62,16 +65,19 @@
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
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "linux-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
