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

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

commit:     d6d3bfd2fe1eeb51a047639da628540707ea217a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 15:38:16 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 18:54:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d3bfd2

sys-kernel/gentoo-kernel: Bump to 5.4.105

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.105.ebuild     | 97 ++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index cf69e0f9253..82900b824a1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-106.base.tar.xz 3181936 BLAKE2B 24740aa8622bf74e6ac3a0820a7b
 DIST genpatches-5.4-106.extras.tar.xz 1772 BLAKE2B dd85fb56fbd1add37ce586b349a16e5389da9ac881c7a41f9af8bbe3eb634266c1655ceee8329bf75d7a7529ba6c716157cbc16aae4554eb36a7d2046b9afd60 SHA512 22226abd7dc7f51645eaa04796928e2c5bd2e2f2068ba991f332b0d61c5007201a6d29e7b8991e159525b66baf8ccdde3a70a42a7152f90c0ea9f2dc0dfe8d7f
 DIST genpatches-5.4-107.base.tar.xz 3190332 BLAKE2B 371004131cb2a5a6217378279a5f062ef1bebfa509ccb8e68343f12bffea0d78735b4e262c80decc2112bbaf6a5d5b96c70db0de5a0c2bf4fa4cd0dc59bdf0f8 SHA512 26b53a82e5c5f8216e86ce34a8019695581c709d86836e18abff73f364958a970d2cfd1789c9165d2f58dc56b3c63c4d124fd598c6dc33494e0fc2906560a554
 DIST genpatches-5.4-107.extras.tar.xz 1772 BLAKE2B 4f4aad8cde357553f2188e69623653e5c37e9551738a45b813eb4e4f2cd2acdf946fa9d68aedc31dcf3073c741a84b50a56b7c6e44773af747906c964d1b23c5 SHA512 d8fce09180d17a820a215bc6a1548ba39f407c8dc49d7859b7e9c6fb3ffc5ae1f0fbe3de11d95537582d8221c65bdc4d99abfa21cdd676aa75da0d254f414dad
+DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
+DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
 DIST genpatches-5.4-96.base.tar.xz 3031600 BLAKE2B 9ba35f7958842a1fd4c9a7e7d3666ea1339ee5fadde6b771b78f67a8bb27c07e8dad8498e9b85fa0bcfd641f5aef9641793a02061b03becd372ea86245820895 SHA512 3edea8a4fc2a29e0f989089633256b270589ad77a225f3cef6e414c5877de1be8a4d5d9da28bfa4fba848f33ee322c4f01befcdf384c9271c97c90e2e2d3ad39
 DIST genpatches-5.4-96.extras.tar.xz 1772 BLAKE2B f33c734139f65245694d3cb98712733a901e89c79d05fab03de42d82d6e45ed3ec41ab4e17f2cd20be2ec31d469cf02a5efc7bad93832c67d3ad0bbf147b07e6 SHA512 8b7d6d058906b9c9afb7addba0c3072d70758bd75ea2989787beab5a3a83725541b4084c34cbb1e90b6cc8bb323a002dfca7065cc88fc834891f04397caa645c
 DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild
new file mode 100644
index 00000000000..103fdd6ce9c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}