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

[Sam James]

commit:     99332e7c7264b295c67591ca0ea2b364e893c5fb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 01:17:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:56:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99332e7c

sys-kernel/vanilla-kernel: Bump to 5.17.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index bb7e8691f6f9..cb6816f6668b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.15.40.tar.sign 991 BLAKE2B 0fc23aa789af5570448d723f11e6503c508e9485
 DIST linux-5.15.40.tar.xz 126329200 BLAKE2B 5e6b6948a137542594011918d059fcef49fb13b35b99a3eff57838257a97749534a568a2caac7f97ca9d8d0685a6e73be9c6b5494e0a67bf45db49e922c37069 SHA512 2cd0ef9f0932bf5a2a400a467687937cc5164cedd79ec0cf726921249e1d540a9ecc99cd8edb3e8ee74ebaa7a131dbf19886f5e858bf7834b59779f0d110dbf8
 DIST linux-5.17.7.tar.sign 989 BLAKE2B 8e83a92b4be4a20521051e04ca6229aa72441ea1634e7140ce28049f569a8e9a91a963f3aad816d8ffc89e1e43ac7f0346f9230dfb7eea6b67f8ec4f6dd7b36a SHA512 8c3de748ca7d1ddc25932acca0d4dfb1e355ff77cdde9add0f6f9f911313b0a6ea797e44e8c9813bf97d7cc4bbf4d34e71c19b940daa0bf226bbba082fe09666
 DIST linux-5.17.7.tar.xz 128454448 BLAKE2B 1c1b1f59404becef201c28d6677a2a52a828a51903d0fe5b38a931fa25694d766eeb222b02f674d95ea8c67c29e0f3420b88f94bdccfc2f9bd575c2605e8f229 SHA512 c70ce704b65bba14237e1ca042add6ca075b08d65e9b90d5441962ee2e6a70a58da72ee847a17917e5d170021933eea6b681a5774454f2228b2153e76b440c97
+DIST linux-5.17.8.tar.sign 989 BLAKE2B 29e345830f5f82b3384351d3896be04e51f5cbcef1d63be36fa2e5aea5220de77dbfe29dfc1b79998314ae494d5e76a69d394b8645b98d8c5d06ac1473a66ced SHA512 3b5ccb002fd27ec29675ed50c33118cb758ba71d694df43fb9f1a3e0ae9002f135d50ddddfd3a856ca14fdf41e13367fab6f95432625477f4d0ab0a3b7b6541e
+DIST linux-5.17.8.tar.xz 128448020 BLAKE2B caa76ccfba188bd868e0a1820802df10d369ade805e9bd0e4ec9efc3bf489070afe8fba469ed8480805feccad4ad38232a6f0ad64ef4a8f56582c4d1158382b7 SHA512 032feea7138d0b9b016a50769e6f10889e0ec8cb532569b1aaecac957211e60cc9207aa6ac2bb379c967c8322f8ccb19d2834bf1f88c03d0774b087e08a9a22a
 DIST linux-5.4.191.tar.sign 991 BLAKE2B 0897c615b6b49b0d18c2c3f3bd6767b706c5fde582c6cf2954f4ef91756b11d8d10fbe5c83ad616208ab5fbd2bceb64b358b3aaf87f4678538e85096dc9b22cc SHA512 f18cf2d5bdc7d2c60bf5d2057073e4a0afffbb0673b809b98ab80ed203a4ff292fab45ac8a6faf1853715f5e3155afefbc663aff28f31166ad17a629157c6a31
 DIST linux-5.4.191.tar.xz 112925776 BLAKE2B c4ac730ee2d6686b844009d9ea5bc461a5eca9fe0600a3d66a819ae32e0d3a92aaceeab9785a325a5c03fc50120e650c16b349d5dc6ef7e571980859c16446a0 SHA512 c94b274c3d49cbf3de085fabe99a0e63ff8fd6a6628eb0f2182db06b0480bc0c67991de9c5786c1d252e020b3cda4ccb29ce93ab599065149b3211786842baa0
 DIST linux-5.4.193.tar.sign 991 BLAKE2B 868843780609978ca9a6393914d3e4bbc4f0d5ce348247286434ce67514ae5c34f741f0a9aa137cf8eef5254638edabc439dc83294c9f9c3fc26feca2f846a21 SHA512 743cbbb2989deeabc881efb1c1b2b56d623a4c457770c6de4b4498edc826f8039e729d8dbbb0a351d17e2ff290b122d5b85f5944aa1aed7ff5a73705ade449a5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.ebuild
new file mode 100644
index 000000000000..87bf3c98dde9
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.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
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.3-gentoo
+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://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/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[@]}"
+}