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

[Michał Górny]

commit:     8cc2f39fa658ca83e0c6e00d86641566d69717c3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 10:15:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 14:29:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc2f39f

sys-kernel/vanilla-kernel: Bump to 5.19.12

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.19.12.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0088872445c2..97d0f8b7c87f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-5.19.10.tar.sign 991 BLAKE2B 4d9c1de396214aaf5f0f661628cc0fe805dfce6e
 DIST linux-5.19.10.tar.xz 131654840 BLAKE2B d2da85f8c863f01d13df0411a519cd739abaf6b49d98ff44eb07962f45af9fa8296a293e6df5d6fd3661112fb4f4ad0de7ab279c2a5765f8c3781e25df056288 SHA512 3377a2a8de0efcfba78982024d450d5de423e84ee5ec317a25673b8176e3968a9891ef6a0465c3be674b3d9cdf06184150d79e7292754b8be8070e4654e79146
 DIST linux-5.19.11.tar.sign 991 BLAKE2B ff6bc783585a5e629b888e7b1b9560014a00e4334a3a78a899c2e9fe19ca1441e4cb8d67a7b264c49c8e08442be44c9330133e1c63c40ffa82bc23107067d09e SHA512 de201e60cd167debb6ce029f06bd758ff85d2826ac5c6fde0fd2c9b6d9bc9146ce8b7b77d0d4b19d63690ecf880f85fa087fcfccb490bd95b10994acbe8e771f
 DIST linux-5.19.11.tar.xz 131647620 BLAKE2B 0927f0dd0f7ca5382c4740ebfe55eb6ba6f9a9f16cc68a6dbe303644950035a6a145534c57577b60f00009069cbe35c4019807334e742602a0946f28c6cde850 SHA512 84e21e93813eea85de5c8ac14fee358d0240f8b0c6f8ab3e41ab5e0eaff3b0bc21f32dec59b4889d9e4bbcffcd7a53f2a9e448e363bacaa15730b80502e7637b
+DIST linux-5.19.12.tar.sign 991 BLAKE2B 437a9fe27f91a3a68b2300e94c2806bf156ac27a729836a830eb48ac8bead0924213c465fbe5f00aa31b121995f54645920efac17cd15534b9d0ae9e1289e08c SHA512 7343af453ec7c39236515617be63ce239de72f99dff491d91db2743b0f1a111ca7697f04401fe4bca7671d306016fc7dfaf01924542dae8e25a9adf951f65bd1
+DIST linux-5.19.12.tar.xz 131684652 BLAKE2B b1f2b1d41070c7fcd50b7a5da730dd45408c0867c1dc2f9c5dcd43057506221207f13b12ede4c4f0fa8256098542b0f90e3b9f96a93c9b18b5c1cf41dbe380b3 SHA512 567dfb4302ea6a8961ad3b6dba332a925d262fbc8830a77da75a7be19db3cb19080260787cfcd0318b7893b71c655e2bcb1fc71dd07ff5627064fd33635bb2a4
 DIST linux-5.19.9.tar.sign 989 BLAKE2B 7a91005e18985c3cd7fc9b2c5ba6e25f756b471479865b83e2c5bfeb09ac0a452a5a580cebc1ae542fdb25e6fc020f20d1716143520286cede0f344b0070e912 SHA512 c9447dc702ec67da6b6f5aae43a09178796959f41faa9ab4770fb2a1b16d2844c9ab09cee09c1c41a31ec0db64e41d0a43ecc392889ddf539923cf5c0855eab2
 DIST linux-5.19.9.tar.xz 131654068 BLAKE2B 2f42b30510e8b778e78d5945b8cf0d5f67e95470414043128470108251a10a5a67841f5f508253a3bd93ebc4203a93e9947dcf7f4aabbe37e09390e7b25b52b0 SHA512 6607af5e83e57182426e22e00db1fcb7ed5fc197457168f2befe283a6710d6a83fd423b914f0ba9e609d9502f67b8690354ec74fd2c7eb855538641a11d73607
 DIST linux-5.4.213.tar.sign 991 BLAKE2B 5266f3850825ba2eb12b2dfd2d61c22550e55da2bd2e1e970fe462bf3ddfb4aa1c156e414efa22d8ef3cf73d625532aef1ea8480f9f8d87d09ead700f616e268 SHA512 4a469aee797ee108c4bbe140010bf976aa8daac98e7b09071d68667f875f8a12c9a1b1bf3350ba9415aac55d9d84e95102b123a4240fa3d61f3f9a83f7c89fd6

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.12.ebuild
new file mode 100644
index 000000000000..25bcd671574b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.12.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+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=5.19.9-gentoo
+GENTOO_CONFIG_VER=g2
+
+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/projg2/gentoo-kernel-config/archive/${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://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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+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
+			;;
+		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
+			;;
+		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[@]}"
+}