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

[Michał Górny]

commit:     10a386a1d15155d6f6f43c7778a39886136f5558
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 12:34:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 12 16:35:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a386a1

sys-kernel/vanilla-kernel: Bump to 5.10.115

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d3014e1a2fc2..ad638f34a524 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,6 +25,8 @@ DIST linux-5.10.113.tar.sign 993 BLAKE2B 076662f2ab09e172f5aef9817beda56753a35c0
 DIST linux-5.10.113.tar.xz 120410360 BLAKE2B bfd4cac707bc8232767aafc0e666ed9fe23951802b87998aded0197a2141d2db20d33f8961e4e03159fd4c397466049ebaa9d47f1f7c512a42739b07e6c899a7 SHA512 7099c83243f707d66ac09bf7215aa3fbc63957c2636fa63f287e526de210952c4106de411201e2ac001aa46c73c05cd4892e633911cfa30b96db7613f832b81f
 DIST linux-5.10.114.tar.sign 993 BLAKE2B 82ef1e2f40ebe97da587d9767da6d86aa51aa883f29b80c9bae39741ae0dfe1c930656706deb1a221d61d44cbb7aa1e6c6603edde137370263d47ba47406c070 SHA512 6d3a1744f1115b55ad16d686de9635c2b983b16257f278b67c2e26a6877aabd8247a70ebe3c47c6b7cc6aeecd26daee43a258257fcc8d47d887ebbb69f6276db
 DIST linux-5.10.114.tar.xz 120403000 BLAKE2B d28ef42387584968a8434d728af10896e5c4512295807fe9fd8efe6148505df5e7b0bbd91dbe611027305b82d573fd4d2b740097683333171f5d7bb33a2bf868 SHA512 d3b769b045ef2582121f3298b797d43e40d341ad6de5a26c547edc65308e69242560fd07629102fa3b1b9921dc208a31ccb146258a219365d7d29c8cb7c0fb81
+DIST linux-5.10.115.tar.sign 993 BLAKE2B a9a276dba44fc0c663c812d3ba96e8bb0c1849d8dac8c65dea9559ec3064c4fffb9b7a29a90ef663a76ba14f987ca8130b26ddc0c0b3c529809b341c37d41e2e SHA512 a51ce18ca8f33cffcb4aa73b0d92a03ed11b310b0266338a0a07e371dcfb2fbbb340b7829f960c17e9cbeb4b5f9ca6f1139b9b64f2671e9a4fc6c795b3977ff2
+DIST linux-5.10.115.tar.xz 120399008 BLAKE2B 95a5354c70d75c92fdaaeb70ac6fea360b0dfe5dbdc8574bceac30a07fa0c93d066528f97e40cbcf375923f526d4ab592d9e1c4a06120c5aaee2595a1e1d50df SHA512 787c1fb601a05f7f0d0f235b703a9dd5f6b8f49bbc4bf4ffb8a46fd96d53a96cf2d508d7e575b3d7a8445118730f99516a250e706803b0271215af9a1c058dea
 DIST linux-5.15.32.tar.sign 991 BLAKE2B 3aecd518f4fe5e9135b802ac280fc2400f3912360dcfe0a5cbbc377a99bf77a55588de1974ae7d99bbbd67d50172b3a5a644b5376b1ba67ed97cf3bb414a856c SHA512 5c18849083f2bc17d1419282559f3fe445885ba412a60cd7c70336341f1b3511e6687ac420708748f0e4b1ef2632c19f4fee1333c0565826b851a7f1b4dfaa57
 DIST linux-5.15.32.tar.xz 126254900 BLAKE2B 37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2 SHA512 6d8955a6b71be155b153db0a43f75822f1f30f339445958828e1611648c8c6e0001cb118e9016a7119de80c28286b3e060da675aa73174a7a262fc8b537aacaf
 DIST linux-5.15.36.tar.sign 991 BLAKE2B 7d7ac1237d1a06b4e55347c74089e1c05ef58ba6b7e06495fddb90a1ede896188a8d6ea87efb48aeb4c59f3e8dd18d86a91f3cfbfe2e5fbc3b8d7bd77b3f7eb8 SHA512 6f320635414855fe3e63e1e0966c29a8e0fb2321f91a94dcdee377f3369512a3c46dc495abcf55a44a0af5c7c25bd3e30562078689e698b2ecf3dcda2f7209c4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.115.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.115.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.115.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/mgorny/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[@]}"
+}