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

["Michał Górny" <mgorny@gentoo.org>]

commit:     377a9f818e55aba8238271e4e6d5878be2a485c8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 12:26:43 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 16:49:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377a9f81

sys-kernel/gentoo-kernel: Bump to 6.6.5

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   6 +
 .../gentoo-kernel/gentoo-kernel-6.6.5.ebuild       | 149 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 02590e669756..8aac3bd8a951 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -52,6 +52,8 @@ DIST genpatches-6.6-5.base.tar.xz 392288 BLAKE2B e6a9bf0886ad85754ec963185fa9204
 DIST genpatches-6.6-5.extras.tar.xz 3704 BLAKE2B 739d6f239b679f80f74475f10ae3a9e613558f93275b745cbc0d8f912e00d6b9a5753ad62193b20fb4401806c315782dd1ee33336434058e4fe0f5e7b90a124d SHA512 149c0eaadc4575c839517dc8e42a5fbc91b896b22e43f21c057ea91240b05936ea7c32e2f8b9bd7c4d7d2bf2dd11abcd41185869837c160e7f8953dd7b3c150d
 DIST genpatches-6.6-6.base.tar.xz 432804 BLAKE2B 805a19720d8ed2a5cb5908c728915a58f5db8b320174f9a6c90df4a2e7d2a58f00c1e30427af035944f99341adf3a33ca5375211b7b40c77bd37077e319f718d SHA512 6ea0477daddd54d029f1a99703254afb131233cdfa3e89163c7ef45941b941e5d72c9df7f509a7280398be2a075aaffcead07a0f85db666c41cbd312d5042220
 DIST genpatches-6.6-6.extras.tar.xz 3704 BLAKE2B 24d5d1c36237b6152894ffe8f23fafeee80ca397e93367228d2f2aefb9b6100eb12097277feb44fdecd747800a81f7f654abc59d84a9bf9d44478cd6e4c7b7ff SHA512 7d00ed37a34ec44b5f61eaab1777cf9d414903bfcafb57540d01645be5f7dd0950784d722f719f7bf1515e985889b11f39bc070edcdf0d67889333ec94c4c772
+DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd SHA512 6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
+DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B 1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107 SHA512 6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
 DIST gentoo-kernel-config-g10.tar.gz 5035 BLAKE2B e965f157b6dadb9c6e355ebe5f9c56625ac69f34a70d6238cd56faf76f7a6583242ea61283c45f2d2cc807ce258c2d405130109ac6e28155849a73871691ea9a SHA512 ad7419f1f183a0380896b3784ff4ab260ff850f2c055156c53f20d2bf3ea4350affaf37aef505e680928ae0f8882f12faeda02bdbd9fc26aed4aaae388290e95
 DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -59,21 +61,25 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.5.8-gentoo 268569 BLAKE2B c854b9586fb53ec1409f43730de3a513dfe9cd85f8fc0c8d1c5abab1c427cd0d88f593c8c530e1b336690eec3805970ad46baa9ea512f359921efb69630f703f SHA512 c890d5f7b0450e652def837406c759c1f20e74f5d9ae2d2abf4de08effe333efc400c523c6feb8974641391bde6d4f1d31e3355f5b091c63beed4980bb8f4aa9
 DIST kernel-aarch64-fedora.config.6.6.1-gentoo 271020 BLAKE2B 63caa50c84cf2a5f0f5ae51d9924e6d62bee4cfdd7479e19fdcd24860f072ae447ff30252f1b43da4f5b6b448bec245e830cd475de86a83d20192fa625531f79 SHA512 e47590731cd9918f8d7f64731746b63fe66c68b6009c6b79acbff116f5d008b2e159b2647f4f2330f05b9638111ea366f5c2ce47b88665201828a1a8aedc278a
+DIST kernel-aarch64-fedora.config.6.6.4-gentoo 271020 BLAKE2B 63caa50c84cf2a5f0f5ae51d9924e6d62bee4cfdd7479e19fdcd24860f072ae447ff30252f1b43da4f5b6b448bec245e830cd475de86a83d20192fa625531f79 SHA512 e47590731cd9918f8d7f64731746b63fe66c68b6009c6b79acbff116f5d008b2e159b2647f4f2330f05b9638111ea366f5c2ce47b88665201828a1a8aedc278a
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.5.8-gentoo 241036 BLAKE2B 4a575b1c78700ef153fa6cc5d9ec5732a8e339e75a5c5decf26de258ab22621e1126acd12bbc7f299c28e7ab0fc50cf22d92b757ed8f1aaed62208fa7a7ec976 SHA512 9541a318e67ae06838d7b563609742a1acba078b4a8cfce3ee4034a9c251ba269a881a6f1529cc8ea7315601040b2b0c867bd2281afb6c4fce68c19ae3140db6
 DIST kernel-i686-fedora.config.6.6.1-gentoo 243184 BLAKE2B 57a1dd996f5ecbe80143fa059aca140432d326fbdcc2eea692d252cbe61be3e67be7a8bbcf5eb5af4ae80b1bf87ff2b0797c9b926f23e2f9dd1b0176b248dbe8 SHA512 67c874c11db86f51a2e0855e9ddd8b4b22444247e516d7586e3b236b3dbbb35981a6f3d20bd29dd56f00562161bcc90e67bd2a2c231d01bbb5e0e0e6d4a3bc30
+DIST kernel-i686-fedora.config.6.6.4-gentoo 243218 BLAKE2B 745df259d518ef86c6a8462bc9e764a26c6ec41cb7ce4c56a0d4f973d04938d289258a506424cdfe363687d1998d04b2b259a7e1ac55c062a389f1d3ce6e0b4a SHA512 fd683d6d40c7ecb6eb18e0a4457ae6bbf6641e0b2e185b83304128c6996b73f98a95330d39413b7e2b6537d44e04b24a5f131bcc6570b4640ea55d6c823c105b
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.5.8-gentoo 230679 BLAKE2B 9c77b6bce636150bf3413e465cedc339d5ae2477e4c48d522c72f64cabcc8126cc5eeba07f2c698b5dd988ea6231c4df2b03b72370f38af3c1d4e282ee2c7d49 SHA512 04a0a7839928e30e891faf572e3a7669685fb9baa5ae6f7ec85cba089db828cff1d33d63dd789bf9f12ee0c4d777ee7c3ed103d6a5d539d43ace7b1cf155607e
 DIST kernel-ppc64le-fedora.config.6.6.1-gentoo 232893 BLAKE2B e23331376e6c6d4262164479ad1ac24d28d7bf54b247a42e97019f25ec3f600c00a9f02bf0157f49c4ceab7ac0aac06dd25202f1c74ddcedc47dc290b4ea34cb SHA512 42e2805b30c5ead99b5838d74ff211a8fd819e221e869c9eb8b2c97700fa35bf20656229fe667dcfa649c10971143f77bb0f5c11dc962904db4e9730ca98d6d1
+DIST kernel-ppc64le-fedora.config.6.6.4-gentoo 232893 BLAKE2B e23331376e6c6d4262164479ad1ac24d28d7bf54b247a42e97019f25ec3f600c00a9f02bf0157f49c4ceab7ac0aac06dd25202f1c74ddcedc47dc290b4ea34cb SHA512 42e2805b30c5ead99b5838d74ff211a8fd819e221e869c9eb8b2c97700fa35bf20656229fe667dcfa649c10971143f77bb0f5c11dc962904db4e9730ca98d6d1
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.5.8-gentoo 241611 BLAKE2B 471ded43ec2f75998fdce8844367a6f14c06ee83c0aea343301b1ea901b4e8e185855099ff61ddb855953fba1599f8874bb8ffe4da27152994a0cbbc53670e28 SHA512 bd92695c32d33c6a90eee96e481fcde02586d71d1d0da158b04d9e9f3dbf9367178bdcaaf71167a043df646c5d715b087f1acd1ecb4f3690dce766604676e7a4
 DIST kernel-x86_64-fedora.config.6.6.1-gentoo 244276 BLAKE2B ca596be21a19f10b7490719f73ee20ab0f97c5b32d5a8eb38c1b8dd7f299b5ea302a488b04e76ac7efb7e8d5444c7af0a896edfb1ffe7abb58be85b03c55b2bf SHA512 0d07e65968bdd170f16bd4bc7a8c99965cc22547f50b416a81541ec6dfa4da88f2fb70969c04efd923b79acfb35ad8f06eda1fb657405bfce5c14d636cdc977b
+DIST kernel-x86_64-fedora.config.6.6.4-gentoo 244310 BLAKE2B af982d23c80d1b19f84622298fef525cb0b51680d0f064c8cc940be33b55aeba6e8ee913d13bf33287167a48891e6e26ae8ce4f5a1644714132801f4a8b7c319 SHA512 913a9f9aec6898dc3a86611539835861b8d1f1380f699fdcadf52457619d5e6fdde4b9866a6216c50dc5a337cc09fef7b3a00a989cc6f9ab512dcedb15dba8ff
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.5.ebuild
new file mode 100644
index 000000000000..3c8a911d7bbe
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.4-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+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
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	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}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		sparc)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}