sys-kernel/gentoo-kernel: Bump to 5.15.4

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

2 files changed, 111 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index cde382793f87..7c1e18087426 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.14-22.base.tar.xz 864000 BLAKE2B 0a2ef4aa3504d23bc2ad1047d76d7
 DIST genpatches-5.14-22.extras.tar.xz 3844 BLAKE2B d8934cf97acf49434a817afbe3260da98f3bf52c3bb93d09e510d5c90b592af25da702cb1d6cb2c4ca463428bb35b7aba248f13ae48c094544460650c0d7da6f SHA512 d33c4adac4ebdc6a122ec60b37b8e8e1b3f8b47bc6808707c4fba9d2c8d89ded193bfe0cb0929c23fd0fc82ea1cf3d11fa739555606e6313712265e84a7cf033
 DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 59f372c304cff219647a6bf84965e13ea13b0062be222109d3baffb2e243a93905b85fa336a1592fdb2bc48ddb29a34df9d139521a258d56c363e5021f34689c SHA512 4fc8490701f55113f51314805114d3c225525b2464addc29642d337f6cfc5797bfcb0052a7f7b4045bc8b2e48fa673f5334f1c10fdd3df0bf7bcfa4bd022e36a
 DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729 SHA512 ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
+DIST genpatches-5.15-6.base.tar.xz 300776 BLAKE2B 1a3abd9e88ee1bbadf68e0a711773706e3b338626a289ce25db0591e59aba3e71ccdf5c61ec339ac55fc5ef0673415228e4a14b1f473ddc12a280f8bac5edd8f SHA512 1bceff3515b4943093d6650c7455a6f18dd9850cd84a2cf53aa9ecea46ce47dd7b760579f968d02cf22390eb7556f9e319ca842328c0ec0050ff969e10f0cbdd
+DIST genpatches-5.15-6.extras.tar.xz 3840 BLAKE2B 0c17070891e0184c34cf4f7c28648e7ffdc56992bd68113735b1f90bf0b46330d37239d4f4a8448de315e1cf2741e3c07a769eb8aad57f1ba9ef107dd8c30241 SHA512 aa484998b7789569896470d1fedd282445aa71a945b1f4d5024acfa80b6c16eb199505eaa089f7c0afd6c26eb3fc5692a890a3c0ffa912e9fa0e2ed5808d3452
 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
@@ -19,21 +21,25 @@ DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611
 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
 DIST kernel-aarch64-fedora.config.5.14.14 239141 BLAKE2B 694ab65aa00880dbce213645114e5f0b751036db23f4ec17d45d46edff4e597ffd716f52e158f278fe0eb70ee254be6530040dffd613c0e9cc403348736a8940 SHA512 b5f19b136462e162375a0dfc17415280d83a910797c8e383781dcc61610cb2842cf9543ffb208ad4a90a9d32222322ef049ccce9ca6d9c2b6aa7ba2f8cea7a50
 DIST kernel-aarch64-fedora.config.5.15.0 242542 BLAKE2B 9ba501ddc85198bc35e4524aa19ea9cb0e190cc3b93eeb9338d485a5c49a47a4506fe89183c2b8c0a6abf23361309be88900528110e733fd3efcb510c625941d SHA512 f479a332573c5fb0641b2c4062727a7a76b51039458d53e51dc9019b9844fbeb3f3966bcd80092e1d5cfc64e19c33867beecc1affd91fff315b08d8783c787d0
+DIST kernel-aarch64-fedora.config.5.15.3 242673 BLAKE2B c8a50439b16491e5f659c53a0871557ca191b4a4b45d950468959b529d85f986618444eeae4fd06deebfbd6b640d54357f232b640992dff505bad454e446cf3a SHA512 012b4e136e83f70554bcf4bd0f1387ce5b8f1ac2caae0cfaab72e0b969d7843764c43d2b7b77fa2bf387f367f5f0a458ed2ec1379ae9ec74c842e4e4e6164320
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
 DIST kernel-i686-fedora.config.5.14.14 219455 BLAKE2B 7e70512be2276e33e6f3ad7f229bc2001fb176b36fe37073c99c9415201de24b4c81af6d3b55ecf47fb194311c654bc0631e7cf3d0f1fbcc605d69ec19a96fcf SHA512 2f49e512a752dd4d691e6b3b1bc5c6021ac484b07d3eca2876f249f423ffef6236ced4cb2572c746335acba1f543690c805b0a7516022572d1f48878948f1cd8
 DIST kernel-i686-fedora.config.5.15.0 222204 BLAKE2B 339fc3846f5585233d5ce568b7a49cc453087c6244361f971d8ea1a064ace69f631f96284e6fc89b41fafb57a8b9ef64df69c199e1423dd6da168715256ef4a5 SHA512 ace20295c458adade57ce3cf78e178432e6df6a690e1041e7ad6b658540d55007d0843abbd3029a3388098bb45655fe5b0ff5795ea6796048ff60183db7113d3
+DIST kernel-i686-fedora.config.5.15.3 222244 BLAKE2B a937a64561c94ab52243384a9a4d3f650e23af320916374994069e3eb0eb0cc9761c1a47eed67d9ed2ca10c425578b7ad410ee551343d6b5fbbf5abb52852d45 SHA512 801e6b5692d907cc20193180084381a4129bde687796db4b9e9ed9266267bea50be85b23927d5e14ec0a2a977aa40f5ad5c23fffc68683f7f6916be7e65d99b5
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
 DIST kernel-ppc64le-fedora.config.5.14.14 210245 BLAKE2B d9c9ed660d5a525d53c9192cc8e00a484364ac34d8fb6f228e751f6ad35ad8ead111b3c7863fa29f99b6bdde1de64296745a5b39621fad83b2fcee7dcd2a93a0 SHA512 c04582e579025ffce63d1cda81c45fe097d5d0c811324aa86d53a28c398c4eb0175d621846bf26d037ff552378e8dbda4e05afb280d75f45ac83530588eb7630
 DIST kernel-ppc64le-fedora.config.5.15.0 213222 BLAKE2B ea73dad2749332cd729d43d08538300a3687add1029e16563fb48fca0f46f3c1ed064d4e024fe733de51feb377d7010a862ad6ccebcb53aaf55a9409d23b3b10 SHA512 84431c547dc14a721ef4d2347c92aa6ffd2847b57e09be3227be7bbbe51c38b1b828dd8df5e5e5e44610e92a75623d55f32eb110a428c1d18721b6187a80c6ae
+DIST kernel-ppc64le-fedora.config.5.15.3 213350 BLAKE2B a95660c047786634937ee32f64f4ee28d8d5b7b94aa2843e52a9bb6b0a9739033a8d4cad732fda976f07d0253b0645ec3afccd5aa749953d7a92c6cd74316ec7 SHA512 db5565ef536ac7ced3d38a213913e0f1ff9d23ff3d43a48c1af6af225fd960fd0606a289dd4edbceb265e3b53c698e293d77b0f6db236277e9afa3c687f950a3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
 DIST kernel-x86_64-fedora.config.5.14.14 220477 BLAKE2B 3495230f6de14ee07e6a03d889b8f27dc509ce2a1babe4a5a8bc525e3007325fb6814c7c078146eb7da61778ea179d84b0128fdc7bec55aaa33aacc0ab3b52e4 SHA512 66f9fad1fec43b6aa0e8c4214966290369296eac6780c10a7c1dd50134736529a3dfd5653d0f62b39c6bf56ddb4ca71c353bd8b0924172833f90910074c16df2
 DIST kernel-x86_64-fedora.config.5.15.0 223235 BLAKE2B 904b162c4ac7dc43fa72802dc452c1a708062472e2276586c8ea9445d1de0358daa6b1b56abe2c31fcb1c4a0993395e9f1da47399f07aa32aca35ddda4dd8d67 SHA512 82733811d56d03a82a9818589a60a957b5db4cf475f6fd4b129d8c1b50e7fb610914d534fe80f6794cb38e30405dc957720c3c81b049a70f359580ed4a6d5eea
+DIST kernel-x86_64-fedora.config.5.15.3 223308 BLAKE2B dd23166b4bfbe1ae84bd253b1dd5aaa6e427b3ddac52d6637d54d9294d368b433ba597fb98e49a0b595becc81ebf77b7b7f7d1a0cc5eea984224fb7d5285189b SHA512 5c22bbb5975eacf206d2194f1ab245d5d85362e8972ad88748f0e038765792f55e96090f50fc2ef39e9dd9d633ad34e72e37e3c0f3c31039c3ac35ed548b1243
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.4.ebuild
new file mode 100644
index 000000000000..3b7488f75c84
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.3
+CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( 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"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# 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
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		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
+	kernel-build_merge_configs "${merge_configs[@]}"
+}