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

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

commit:     8c610d32f5642e45c8c3da2cca28be5ab3ec35a8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 15:00:37 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 00:12:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c610d32

sys-kernel/vanilla-kernel: Bump to 5.15.11

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

 sys-kernel/vanilla-kernel/Manifest                 |   6 +
 .../vanilla-kernel/vanilla-kernel-5.15.11.ebuild   | 129 +++++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 70d1c26ad32e..d5a5297cefc8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,18 +3,22 @@ DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.14.20 239144 BLAKE2B c0338596572c41326cab4248f7cd8cfd3e4bbee2298ac672d83fa3a9551c3f1cd571f4cf1b3e9ba9ed39b73d724f0810062f33a98462079dafea0795232a0280 SHA512 62ff676bbf2e218236c7b19fef388c1b9cda640a690e4482617b565f0c08778bbc69be8d807fb1f3ada3ab6c2dd578f53058b8c1c49ff2d08a6de21b394fa531
+DIST kernel-aarch64-fedora.config.5.15.10 243077 BLAKE2B ee19d6963cfa977b40ac7cf621c03f0095f2dc538bbb0c075e6a273750032870312b42df0bf63affd1077215f671156a129ee3f670174b0c9dd6027839125f7b SHA512 1a5f254391201dd047a07419e5b83bcdc10abd34e5408b9b649119cdf34d1e2320d4aeaa0e57c11254c612a37ac6991282d8a1b82957ac877e4f8573de28d4b3
 DIST kernel-aarch64-fedora.config.5.15.7 243088 BLAKE2B 37ab99a0d66dec21e1c79255640a99892155ad602f19a00482f0ab70b3f90cb14bc47bff224c35e6ea024aa7779a8aa79d313e9425c3ba6af185c75e25b4fb1b SHA512 afee2300eb286a5a45e5f68b4e66335e048748f7c90573272132b047e48e2d3f62941a7647758501cb41c8e28b96d074d64268227385f6e0f2542417cf12eff9
 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.14.20 219422 BLAKE2B 11aad144bbce274c52f4210f0fccb1edddd1bdb32f24845c34f07ec969b2da65f57656e56de99ca32a35639c210440eed7ec5ac6e18c26ec14230b2969f45466 SHA512 585000275c4afc45c5f35b9767271115f1b0de4b7a1fc8f111076895a07bc9ce31a912c50730ad6fc6cdb145639da664a44ce550a476982c14f6c8a89d10e15e
+DIST kernel-i686-fedora.config.5.15.10 222607 BLAKE2B d5c99b44d9bf5e76a91850c342702ad5db8337abc7deba0a089c53e296cc043ba1403de696408bd444e781903e303a3cdb1640f6d279598df625d7b758ec7b37 SHA512 6eacc314cd1770a7bf935d26537c3c9f88d0cf4069817f1fff355f5dafe22794fdaddf14c2cebe5757fab85d3731e1969e92ed1a7a1c7a778a54513aef00910b
 DIST kernel-i686-fedora.config.5.15.7 222607 BLAKE2B d5c99b44d9bf5e76a91850c342702ad5db8337abc7deba0a089c53e296cc043ba1403de696408bd444e781903e303a3cdb1640f6d279598df625d7b758ec7b37 SHA512 6eacc314cd1770a7bf935d26537c3c9f88d0cf4069817f1fff355f5dafe22794fdaddf14c2cebe5757fab85d3731e1969e92ed1a7a1c7a778a54513aef00910b
 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.14.20 210212 BLAKE2B a79cad7e602acfeac644c2d0070bd6262e1d87b0681362ca0b6f9cdb5f9a174f8d4839e94e33a944344427024d44e10cdee36c285a42da4a78a89225bec0da88 SHA512 c07350360bf6457cd3b4fa2c822a347b3108fd79bcd314cad32cb6b4390efa9bd474e05112df48caa5e99675cc0333583fde668ec48ae341b68022c9c6952c60
+DIST kernel-ppc64le-fedora.config.5.15.10 213801 BLAKE2B 29ca7ebc0470c954fb4ff282efbbb27b5552c6db54342bb9e3a3b8086518f724bfbbff4948ddf9729f179f227a06e1167e93558169be9f3a73186efef6ab6924 SHA512 f3d276dd44bb8adcaa5713e7e4e54a7199c9dd51d6891ca25d904190ad6fc07fa8a5e4d1416b7f25ed944f6f3004776e1748de8b3b79a977b398d0f448a74fbf
 DIST kernel-ppc64le-fedora.config.5.15.7 213801 BLAKE2B 29ca7ebc0470c954fb4ff282efbbb27b5552c6db54342bb9e3a3b8086518f724bfbbff4948ddf9729f179f227a06e1167e93558169be9f3a73186efef6ab6924 SHA512 f3d276dd44bb8adcaa5713e7e4e54a7199c9dd51d6891ca25d904190ad6fc07fa8a5e4d1416b7f25ed944f6f3004776e1748de8b3b79a977b398d0f448a74fbf
 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.14.20 220444 BLAKE2B 7cd8a820ce47d8f9fa6271df0ed4330cdf43345676a5baadd6d32da22f7962bd4fc0ea436e0e86a82e1a35d585b509379e6c40d6a0065b44839e6db76c3950ff SHA512 3229eeaebd52a8f57790c23c8ac027a2cce3eb43a8ef9b6cb8e54cd8b24405dc31d203a81188dbfb4bade814adffba471051f434e2b947f3cce1fda5645e489c
+DIST kernel-x86_64-fedora.config.5.15.10 223671 BLAKE2B f45dcf49155b383c2b04ebcf0964355e1fd2a306a3523bf1d1dab57e456edccedd6701051d6de5d9b2e0d12b3e5409546ed1034261af656d2a929b3af4eaa6ec SHA512 a9860e58a1005fd2a437fe1e4e99d60cbde71b251ae13daa49aaa60b8081515fb20e0d930b2ffcf78b65ad6453b8be9815d91a1b0d59c96301d0e3bb553a9a74
 DIST kernel-x86_64-fedora.config.5.15.7 223682 BLAKE2B 6198dec51d2a473b5eba319383a00d0b640267b778bd291af992a67122a7d1bfcc1991a56c42e59ded64503e445baeca753cbde5ca4910b3cc4644819137f8bb SHA512 d73848535baa276a129ac5f0674dba24eca7bb56a8195d24cb1bdf6c68f17e8a1734dd67636ab73c103c2a42de1e7a9692c7f816406b1280ffaebc93cb465c5d
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.85.tar.sign 991 BLAKE2B a15ca5ba6b75d8ab118c7c578a33d47224f9b2c9382190ca1656c66e5391b6865c7a88cd33f6e28f0e905ac40995992c7d356fc666f692355bdf8dfb603d8fcd SHA512 6142795d2e689a4a4140122ec1559db02e78fd6c766e9d3ac4bafbbde2b4ab12bfeb7b6d7be91ce19b6e04e488eb15b90f3f56f83e2c999b7b64d37b7867bea8
@@ -25,6 +29,8 @@ DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e7
 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
 DIST linux-5.15.10.tar.sign 991 BLAKE2B 22e5f6b14793a97fcdf0b7f1e109d726cf541dccfb27c44fae4f39b76b4ffad2834171fd40e803bcad1a2a7ce6fc5a6754c7e1387e65991043d679619095915d SHA512 2580426744f80d756a57566fef7cd0d410e85c69514fcd1986dd40b82743342cb7ce0dbae0e8de56d8393037534cf5c8af6cc70f750b71b44a6204731c9c50c9
 DIST linux-5.15.10.tar.xz 121948408 BLAKE2B a21e5a965c0a4fe2e014961a6cc8f4c621fd9313a4b170f97fd3f77ae2494e721bf579e68d5836c167ed9fb6674784b20722501f6adc44d634073e74a82da765 SHA512 cd57fcb1e10ab380d3e9f99b46f3bd38bd4a05e00f53655f5a1a644da2612c9ec2dbc87fa3f87f06f1ef334f6e669025e8f144a11e9a4d64184f60e922b269f9
+DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714
+DIST linux-5.15.11.tar.xz 121955784 BLAKE2B 37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd SHA512 5abe52981a9f493174afb908bc1c1a4901bc522c38c2da7ba15d5b907f06f9c4a684a47436697d79df8f598e166064d46add5661632a48275e0268411563f6b2
 DIST linux-5.4.166.tar.sign 991 BLAKE2B 0051ff905ade9e7c4c5089602f940d643301e6f45ccc460a5c394046280e6dc5e58837d9b30115eb22d5cbcfde89707d1a1d1721f1ca4b7daba5bac465a1b39e SHA512 7469a77ec4006584307a7af780f4737d52b8d8a5f1f039107d2210e8b5aca0fc83b0c9cee9d80dd85db2070fc98837274519bfdcb03d115ad377963184ea83f8
 DIST linux-5.4.166.tar.xz 109194364 BLAKE2B 531351c5ef90466073bdf19ddc4eb7ababb87c8343c10c9c61c236bb96c47524935733d25603781ec4412fedef8fe8ebffcec893b4283fc91181ec3201b29acb SHA512 5550095b77209f33e799ce1fd8d85289ce9b76315e50d3b1216e581457d279c7763df050e8a2e78748de87da4f5aefcdc4e437f3c54ffea86c026a0caa4f08aa
 DIST linux-5.4.167.tar.sign 991 BLAKE2B ba73a1a1aebaa749ba6b1f61fccb03712b7d6f179b125b54436f485c5e7b943157aa6ac86ba0c9277a245539c276901eb5e102ee776cd3f7c4a92db3c721241b SHA512 41ed244c64d402c16bd57afa4746e262e5b1d0329d99f3dccd617af6fbfa43b340fd66789f0816ff4d7c5cbe04173c1ee04bd6c7eeb751049e7272913b3b33c1

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild
new file mode 100644
index 000000000000..fe8dc841eb14
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.10
+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
+GENTOO_CONFIG_VER=5.15.5
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${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
+	)
+	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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	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
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}