commit: 1c3a2bb118ad847ba89b6c2fa1be725ef3229113 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Aug 18 11:20:51 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Aug 18 12:49:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3a2bb1
sys-kernel/vanilla-kernel: Update 6.6+ and 5.x live to g17 config Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.12.42.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.15.10.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.16.1.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.102.ebuild | 7 +++++-- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild | 7 +++++-- 8 files changed, 40 insertions(+), 16 deletions(-) diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild index 3c55a122d745..fc4acdc0d4ba 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild @@ -10,7 +10,7 @@ inherit git-r3 kernel-build toolchain-funcs # https://koji.fedoraproject.org/koji/packageinfo?packageID=8 CONFIG_VER=5.10.12 CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 DESCRIPTION="Linux kernel built from vanilla upstream sources" HOMEPAGE=" @@ -126,7 +126,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) # 5.10 series: No ZBOOT, disable explicitly to not confuse the eclass echo "# CONFIG_EFI_ZBOOT is not set" >> "${dist_conf_path}/secureboot.config" || die diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild index b06833b12af9..cff136347dfb 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.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=" @@ -130,7 +130,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) # 5.15 series: No ZBOOT, disable explicitly to not confuse the eclass echo "# CONFIG_EFI_ZBOOT is not set" >> "${dist_conf_path}/secureboot.config" || die diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.42.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.42.ebuild index 7f6ac9552b40..d3de2001f8ed 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.42.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.42.ebuild @@ -12,7 +12,7 @@ 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.41-gentoo -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 SHA256SUM_DATE=20250815 DESCRIPTION="Linux kernel built from vanilla upstream sources" @@ -151,7 +151,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" } diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild index a75da38284c8..f4a6c2593637 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9999.ebuild @@ -11,7 +11,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.12.8-gentoo -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 DESCRIPTION="Linux kernel built from vanilla upstream sources" HOMEPAGE=" @@ -137,7 +137,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" } diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.15.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.15.10.ebuild index 8bb159b387ca..ebc8e0fe44fd 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.15.10.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.15.10.ebuild @@ -12,7 +12,7 @@ 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.15.8-gentoo -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 SHA256SUM_DATE=20250815 DESCRIPTION="Linux kernel built from vanilla upstream sources" @@ -154,7 +154,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" } diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.16.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.16.1.ebuild index f1615b17eb99..dc2c432315c4 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.16.1.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.16.1.ebuild @@ -12,7 +12,7 @@ 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.16.0-gentoo -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 SHA256SUM_DATE=20250815 DESCRIPTION="Linux kernel built from vanilla upstream sources" @@ -154,7 +154,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" } diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.102.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.102.ebuild index 308358f9d3dd..53db8b247703 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.102.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.102.ebuild @@ -12,7 +12,7 @@ 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 +GENTOO_CONFIG_VER=g17 SHA256SUM_DATE=20250815 DESCRIPTION="Linux kernel built from vanilla upstream sources" @@ -147,7 +147,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" } 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 c3d749183a3d..b3c748802fa0 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild @@ -11,7 +11,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.6.12-gentoo -GENTOO_CONFIG_VER=g16 +GENTOO_CONFIG_VER=g17 DESCRIPTION="Linux kernel built from vanilla upstream sources" HOMEPAGE=" @@ -128,7 +128,10 @@ src_prepare() { merge_configs+=( "${dist_conf_path}/big-endian.config" ) fi - use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + use secureboot && merge_configs+=( + "${dist_conf_path}/secureboot.config" + "${dist_conf_path}/zboot.config" + ) kernel-build_merge_configs "${merge_configs[@]}" }
