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

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

commit:     ddbf057a3cb44365bc2659b099603baa6ee23890
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 14:00:54 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:33:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbf057a

sys-kernel/vanilla-kernel: Bump to 5.15.6

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

 sys-kernel/vanilla-kernel/Manifest                 |   3 +
 .../vanilla-kernel/vanilla-kernel-5.15.6.ebuild    | 124 +++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index fceeef284b78..0ca2a41f5532 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,5 +1,6 @@
 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
+DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f SHA512 5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
 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.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
@@ -49,6 +50,8 @@ DIST linux-5.15.4.tar.sign 989 BLAKE2B 3db07bfff684a8be760d0089076010182fcf726e5
 DIST linux-5.15.4.tar.xz 121922224 BLAKE2B 1ce31010ecd0945fa8c521da092f6dacef9b1223723fba9c271424427a4b23decac11c6dcf68eabf4f5f0f91cc4abab50e3bcbd776632f345fdc86be5ca7d986 SHA512 27c38e4772616852710671c4c9d2301e2bf4eea05e47ecd6493c3edddd23ae8e2a08ee9134f2f0e2bf599e095e1b8ccc92b124be2a9a943367dfe6afde3eb369
 DIST linux-5.15.5.tar.sign 989 BLAKE2B 64814f119b9f6759690c0ca590255e902038b956d0d3edf8e07496832f0adfa6ec01a9c610744a4745be8d3b5014bd797734d2032e253ce2745bf5a639fdd528 SHA512 5830f3a94f864152cfb25ff4fc31d22e3d01adff4507e0fcd48ccaf9866904854fee2bbc68feaaa232a46c9484917463f997b6ccc02915707d00c4ebef2c1239
 DIST linux-5.15.5.tar.xz 121927760 BLAKE2B 2921b549a44ff4202ab96d35d6b7ce99bef914db5c1dba066fb7c4b146ef987d1aed53d0773fbe07cd6bb3b964d40b6f3f8c47f6a04149ea1c64e2f8f87343bb SHA512 7b9a78c734a24e8b67f93c8de65fb57cce498f18f4ce6a5c4cff0b834407dbf66cda6834118e67cfef3101979f2df78a7cc45854d943ffecee60a990783497df
+DIST linux-5.15.6.tar.sign 989 BLAKE2B 66874a91544bf7e83d9346fae63d004bb7f9872170d48c2843b7ec505a74b9a43505bf8dc032f303ce6208affe054c4db50b8ae2e2866bdc8dc25a0cfaa7a5cb SHA512 8e2296e9f80ca5f24d4a0c8d735d55bd4373ed4aeea80b0242407e82fbae7f29e827cff0e2bd9f97a50846dcaa83f3160a96b917c0dec4241d80de6013fea9a2
+DIST linux-5.15.6.tar.xz 121926656 BLAKE2B dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1064b77926f86d93c7035634db8ba8f6c1e2d957ff749b34e218c565c7 SHA512 0f69e98590e796a3ec3e04340fc41954f1cdb7a5859da8efec1ba4a6498760778744e6243d068bc91343e3e7029239ff2e9ee2572f458c6b0e31c23f3686b5f5
 DIST linux-5.4.158.tar.sign 991 BLAKE2B 533dbce299037f4b4fdb79a8562cad9d05ce4027b15ab0611d7901929051c333555caf4eefd621d28b8daf1101df9f557c47bb06c65701a880f0ab55b5226e0d SHA512 4bd5618db8dbbfe5c8f3810c9afd48b019bdb5ad10fa8e63e5ffd6f25558dae52475ac36444407b5350f7bd88bb307a3fa84abf594aa098a7f4e049d672f49e7
 DIST linux-5.4.158.tar.xz 109178500 BLAKE2B 2f17825064e6dd718b3ed71014c9442fa4970066b496a81b059a8f84d22d1c5522569aa672ce08597a56150eff6315f19e7d0eb56eccdd8d9505f1cd1f6ad901 SHA512 ccbf29c70315055ec7f63eb29262970c68162f2e12046cb45ec17aacf0950e0ed8e60a236744f2fdbd4fe5a0b14e62cdbbb345c32b089e5172feb5e170faa14d
 DIST linux-5.4.160.tar.sign 991 BLAKE2B fee86930c4de94769f5c0f4baa4e268412873abf5ac80007aee6452e9a7ba340983b96e7ad5ae91298a245c0ba1541a389fe6070299d6183a05009e38c51dfbf SHA512 5c9b13103e2b7115854d32cfc39b508ef9f0c9fb74a8d83af63b3b514ae280ff6c6e8e576e35bb7ded3d848cf19baf33eafcab7c651002bcd235af5d86118586

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.6.ebuild
new file mode 100644
index 000000000000..e43d6a3e4513
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.6.ebuild
@@ -0,0 +1,124 @@
+# 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.3
+CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc
+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 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/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
+			;;
+		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[@]}"
+}