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

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

commit:     3c92a41d1fbc936d75a969b05bb894845bbce111
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 11:19:05 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 15:30:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c92a41d

sys-kernel/vanilla-kernel: Bump to 5.10.138

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 14f1604931a6..cc394d5ce010 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.10.136.tar.sign 993 BLAKE2B 2b81f6dd2520fe5b5ed78a583a8451bf5f99244
 DIST linux-5.10.136.tar.xz 120473116 BLAKE2B b68c62f0ba53c0cc839bb5be07f0e4f458a565c47c627b6274e50a4b95e08276a30b9bb821bd17074bdbc8ea4a6f463772922a0b6445adc3f64dd3e9858db108 SHA512 10196bfa692646cd60885524fa8dbbb0f401bef83f0bb85415d4b4838b259fb2ae446e76b7c211b46c19d9f11077ecde1d47de97be453e2f06826231764f147e
 DIST linux-5.10.137.tar.sign 993 BLAKE2B c62bbc5440ea85e169eda22f6056504271870fc028a0d74fcdfe9a11c5d4dc001dd61e30f5978379d1a9da063c1778a1869b5ec889f31ae36a9f11ce67a33135 SHA512 ef0b817debfed160797ce67b2ba6dd3862d030cd07f755c0abaa84131f35eace0bcd2b4a13ae1bc8bb3721fd935a8c321f7047c4b9701259080932811c3c70bb
 DIST linux-5.10.137.tar.xz 120483996 BLAKE2B 057f1ca9a6ab1c95a7daaf91bb6825d60593689ecec60b5df5c89e40f487fee5cfea2405bb36f17ad858b5dc6defed8b8f96416eb473e8964b19fbac342f9454 SHA512 4ba670f78af8f32a87329afeb49f13612e3457be8803058647650615a6f507511b483db4fc73a5a3fd9eb6fb17a31d6308d442ddac6056df7096e2076fb60ce7
+DIST linux-5.10.138.tar.sign 993 BLAKE2B 611ade38fa49fccb98deda25a5148b93151ab1a82508b0e64f14a4954bc464784be60c3a957ae7005aafa53639dbd087ae8c8b2882ab11aaeac95101cdba8fab SHA512 0f4bf52d9db557e6c57e73a782f53fb67cf54abbd1ad6b790559aaad50e73d0be37df9f487fee3a9211dfba5effee2bfba166b594dfbbfd691b00790403a13ec
+DIST linux-5.10.138.tar.xz 120492696 BLAKE2B c98d0fb69c29524485efa6d5ee1b45996002da0ec28c1de031a32354e1e93f9ce274e80e595451b0057b8273c8067580b82427a199d25e879e9368e123a91825 SHA512 a308319046b914b5c3e3864d04c8d618269cc87826c77703f435419f467488c1602819e1ce80fb3a8780360456615292ea161053c326b0acdb22138d9a1f5805
 DIST linux-5.15.59.tar.sign 991 BLAKE2B 80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dcb4f8735daaa6dc1d417137b186a08d3d1af0fe9cdf7b3a562a7cd154b8bd9c9a28fe708613f1adbe932e56dd SHA512 34b52887f668c479f530120d0cbab7f4d30bb01cb204ff158b4908db5facf75d51722d2adab66b31dd2dbecf98c707ad0736e59d63ceeb3c27a4220c7633e027
 DIST linux-5.15.59.tar.xz 126404076 BLAKE2B c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b SHA512 1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
 DIST linux-5.15.60.tar.sign 991 BLAKE2B 9260f307fcc8726b5ccdf174ceb956ca37f0c835cd77ea8cdc001f927e376885adc1a7dc979034f4972715d3ddb700bcfec053dcbe436314dd274a076ee236ea SHA512 992aa8c6efcb4406ae508661497645f8a128b5b672960e2d39c2341510e812dd7768f79578b3f99d02ee550781bf2775936cf957f0235727956a282af89ede1c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.138.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.138.ebuild
new file mode 100644
index 000000000000..718e3ea82627
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.138.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+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://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 ~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[@]}"
+}