[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     4189bc96fac6b9e5e314ea5997c7fdb2ce1804f1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 08:38:53 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 09:47:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4189bc96

sys-kernel/gentoo-kernel: add IUSE=experimental

If the comments on the bug report are any indication then this is a popular
requested feature. Adding it is relatively simple. Note that this does not
actually change the .config, enabling any of these new options should be done
via savedconfig or /etc/kernel/config.d.

Closes: https://bugs.gentoo.org/706294
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38350
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                    | 2 ++
 sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild | 5 ++++-
 sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild | 5 ++++-
 sys-kernel/gentoo-kernel/metadata.xml                | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 41bd23d3912a..fde0d34a95f1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -7,12 +7,14 @@ DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B f1c06b3d9f005cf93a317e051104a
 DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e53f894e5749805bff33676263b19b67eb1315012da7ad5df5cf129406c0a0f1726dc31cdc33941eb2c27db699f04333b2729d SHA512 80fdb4aa7531a7b10bc543d8deaf2b82115f9b74112c53f787f9fcdfbf83c626390c4e81a6811874263753c74b0adc19cde44f6a54c22f6ada7e774e7a2247b1
 DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7
 DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
+DIST genpatches-6.10-10.experimental.tar.xz 81200 BLAKE2B bba2fc9daffcd1a6ce397682a4ca825486f7e45b6932f1f8bf9591eb16385caeefd70bb7dee406d80b248209f707f3c63a5b69d03225e6c84c48a19c39480cab SHA512 5d89064860cbc2bab7ee406a24e5e0479ad2502ebee3bb2c2f9ca81c443b8b2fbcc5944eeff262de5acae5c2a8276872f7d813013887f796a67236a905e38208
 DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
 DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11 SHA512 9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
 DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B 2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952 SHA512 358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
 DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
 DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
 DIST genpatches-6.6-55.base.tar.xz 3018672 BLAKE2B f5f3e39c634e196827da06935b783cb87c3503998df6b1f3d711484ab984b4a378feee96a45b932b409593290ea7a77271eb39a1e5085e5a4fde3c3307ced95d SHA512 88b2ef56dc0c2e1e7c34a9a81b8981d4c8ab6ba5e5821cbf3da8e608287375f2f0eaff427fae8f47a59cb9fe2c3b8a9d9c569108f27b833a10c6b460dde0bcd7
+DIST genpatches-6.6-55.experimental.tar.xz 5760 BLAKE2B 0ba9c83ef35831b973dd1d1c2b89ca020a8586fb298ebccd85f6dd16e18af61e4b404dfbb9fcf538c907f8d8edadda29141ae78f45549c2db1513214393930f3 SHA512 3fd7434efbc2bb8fe0a7c4944490611f809a3de1dab3a63d0618995940dae4c47b96279e7d5b876f203916856f1b2029844cc5614fce92c3dfda80fc682055c2
 DIST genpatches-6.6-55.extras.tar.xz 4056 BLAKE2B d54e353fcd41ede054bfde20ef5bc6518056b1069e440e8ef31b4021ba2b85eb4b578e8aa73a0d778e21a692914ec850f2604e635ff178690a3baee4dcf106be SHA512 a59ff175eb6e7491fe635f65dc44878b8fbf5eacf805b7158b3e9b6c4313881d24a13fd6d252f23c7fd9b5eac1a2c110431ca02aa2583fff71cd306d1b4f3cd9
 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild
index bd5891485cf2..f8ab5cbd3db7 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild
@@ -24,6 +24,9 @@ SRC_URI+="
 	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.tar.xz
+	)
 	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
 	amd64? (
@@ -46,7 +49,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="debug hardened"
+IUSE="debug experimental hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
 	hppa? ( savedconfig )

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild
index 12051547386c..6518c0eaa2fd 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild
@@ -24,6 +24,9 @@ SRC_URI+="
 	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.tar.xz
+	)
 	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
 	amd64? (
@@ -46,7 +49,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="debug hardened"
+IUSE="debug experimental hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
 	hppa? ( savedconfig )

diff --git a/sys-kernel/gentoo-kernel/metadata.xml b/sys-kernel/gentoo-kernel/metadata.xml
index 5eaf5d2b77d8..8780632adfa2 100644
--- a/sys-kernel/gentoo-kernel/metadata.xml
+++ b/sys-kernel/gentoo-kernel/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Distribution Kernel Project</name>
 	</maintainer>
 	<use>
+		<flag name="experimental">
+			Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
+		</flag>
 		<flag name="generic-uki">
 			Build and install a generic initramfs and Unified Kernel Image,
 			this is intended for building binpkgs with a pre-generated UKI