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

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

commit:     7304fdc9cf3ca479743f3215d6d1960d2f730ffc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 13:23:34 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:24:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7304fdc9

sys-kernel/vanilla-kernel: Bump to 5.17.4

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a61062f87a39..9060ddc91bfc 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -47,6 +47,8 @@ DIST linux-5.16.20.tar.sign 991 BLAKE2B c530988bde341b2852c6d74ebcdc98a6f8481fb5
 DIST linux-5.16.20.tar.xz 127581772 BLAKE2B 798baf7051b3f20d34741067769c6a59a04ba922468789e61ce5a6c4d0c3d336a0f3bacc9f482827722e7577828140772e5cbd76b844cc836d4d6b26e0c154ec SHA512 21c55ab96ac571a16a4731089625f24918ec410849a8351304894bbb2b47f336586cd9d8f39a6b2e9b920ef0142dfbf758075dd6da606c3b9e936b5960cdc7bd
 DIST linux-5.17.3.tar.sign 989 BLAKE2B 45ae5e1d8aaf7edae921bc9ce1d6b6039b0fef44db10f198f9cabb69bfd9e65a1273d3773be9fc1e049634516627fd811ee83a28de82d5b87c5f3be9caaa781c SHA512 d80644b67eb4c468c4f4863575f424de381c77bbe0b7216f86bab0743a4afe74d81541f582c5cd72d4a8deecc9feec308ea0cd91811e3631690acac44ef43fc7
 DIST linux-5.17.3.tar.xz 128426588 BLAKE2B 03fd68cd2a9c70fcb20dbec8b62f524f032924cf3ba555d78a2348b80bbe61735e6140d0d38d74bf3051ac19a67be7c62c67dfc9ef697097ed24637427e72dc7 SHA512 093cfcc2531b879540318ef2096d00d87f2e91699a5f00087e3fb4ffe8f8c281d02ea9fdaae35cad1a751c85faddfb954a5c1e83a2f0bca9919ab169b3426803
+DIST linux-5.17.4.tar.sign 989 BLAKE2B d94187debf27aa4a8caf3010e2f61bfb8f7001285ef37cd81613385f6b82057dcbfb42c9b2187a0a9538cc8be9862d9ed7fbf78bcaf03b47326ac90b1e415be5 SHA512 ff50c91fe2359f4efc7515b859ef2816123da4b9f2d66274c07c1530d65b2378dbb58f757474905640cc6ad76143798875d5864c7a7ce6abb399fa2d13e0b7e4
+DIST linux-5.17.4.tar.xz 128419796 BLAKE2B a4ce00967f724753f5be39a3448ce6de18f46500d4dab8a4b93a4dfa4dfcb99cfcee6df3808ee355211cbb38819b2b9f7fea6e630db3e03e4a9f0bd952a32919 SHA512 a0f1945eb61527aac886875a83ad720bff3d6cd06ed0ee92ff7795e4f854d797f7688a102f1e8aa4425e96aab789f4b4c82104591de32fdf34ffd5c13622bbf3
 DIST linux-5.4.188.tar.sign 991 BLAKE2B 544964d936af5ac8f877b2fd9fd3e858e1ea7bd82880ffed88493cc737a914285cfab6ec58019e42fbab3997b19148f4ec0925872179cecc1b7be62a02de6a04 SHA512 01fe913ef0da173dade0e0858f8032b01376223b1d99d381fc7118b38ed70cfba93435b97ce3e41f45159e952dd31db3a0bd67cdd32117379fd8847b236f05b2
 DIST linux-5.4.188.tar.xz 112915792 BLAKE2B a2ea3b6c84edc952b8691903243464489b57284d8e7b49ff8d99d8790adadd1489d2d36ce36e4f357118ae5a61effc9f13eccfb97070ea99c8bec72344066aa1 SHA512 fc3cdac63f2add05662561388197380622f5da24d4683d8985e942d04a8f898f38a9dc53b2b045d32f2070494322d7570ffaf4a071a311bc99ea018d81d2ec88
 DIST linux-5.4.189.tar.sign 991 BLAKE2B 2bd2150ebefb85b131020f2ff35bc097b4f0a1e940d33eaa83106280f52708ab746e98e5a9b1aa7a916df3e510ca8c8f135459d84d323c57ab7468dd83ac8770 SHA512 70783540fc1b6ff3aef9362b5e558dc8e7dc409aedfc26b6dc6cf57611d9ce8474133472e61402453a9b53f197c22e59fa8f6b5cf86e6fbbe0cc3365c094ef8a

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