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

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

commit:     c3ba2a8fd055311435f0f7bfb51dc6b0e1d5e8f0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 12:56:04 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 17:35:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ba2a8f

sys-kernel/gentoo-kernel: Bump to 5.4.114

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

 sys-kernel/gentoo-kernel/Manifest                  |  3 +
 .../gentoo-kernel/gentoo-kernel-5.4.114.ebuild     | 97 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 738123bc3d0..577d2aaa4ff 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -20,7 +20,10 @@ DIST genpatches-5.4-115.base.tar.xz 3335100 BLAKE2B 49863f2b97492223e0a42eecc0df
 DIST genpatches-5.4-115.extras.tar.xz 1772 BLAKE2B 49c7ee35b73827fc454adf526f5ceed9f7c71b6ac2c2e954943142999ed7c1e7a58a543d1519c1d3d6b7e4e9aa3970094650663f10b65408414155909037b23f SHA512 d45ff15542dd01aa7381e992fee90391000cb42d421fab243563fcc547acb8576ab74ef78bf2eb1d81fcd327bf76ee3cc3a6addad5f5ead7eba47837d139792a
 DIST genpatches-5.4-116.base.tar.xz 3335896 BLAKE2B efdbbacd50bfb4a54d3de569f22cdf24fe26945266808a5cd01039cf7045d802c7bc627bb2d5866615f6dab1f72ce8992841ce8fe8cb579c4df113efc066b89c SHA512 8500cc96e2590bf114c184ad1eba30aedaf2080e5651cc4c352107fd10218eb5f471ec957b26fff9d3f98f56410c245776f13950b9ba49b053e2bd43254e3e38
 DIST genpatches-5.4-116.extras.tar.xz 1768 BLAKE2B 34c8926f21ae07fa0b18aca7c85273986da3810180e62178f841023e7f896417eb1fad53084ac6f8e140ac90adad839494c49ada159290b806c675eef76c1962 SHA512 1abf8d8cfc7fce46c77d1f3f431b067b2ad1eaf9afe3c025d786b8a65bfdf9e469a72a75b64a0fd191487a391f2a1e717aeabd5634fc372d023d1f5fc39f1f6d
+DIST genpatches-5.4-117.base.tar.xz 3353396 BLAKE2B b4fdd41a247389b695bd5f84cdf1f1bb3df1db236c919375998e273aff8ed6b5a503d58dc8d3df8ca4fa1d2daf0735dce232841ef70018804607b6148f8ead76 SHA512 9ff4502b5983d95182b6dd383e31acbd5b693c0f55a67934e54e092891097cc13bb142a6efa25db127773cad6810d83e835458420ca7c2973e3d98ec188842dc
+DIST genpatches-5.4-117.extras.tar.xz 1772 BLAKE2B ee10f6f48ae519334fcaf405f751d30b2eda6b9b9e5bbcf5a5efa7a41741eca11d61931efc25548a148ca4c64cb28acb9d518920868a159c4813c404f131bbc5 SHA512 94147b0b028deb471eca0a2e302e9f04e5ad8aeb06dd7bb42eacc7d377f514adfea9733e99aae4ad14a85ac87bfd5c90c77143a5c2d4390c2157d6a937f09417
 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
+DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.11.11 225875 BLAKE2B 132f9ef1393edf843a7a5026da736975a465084e550b354e09a13c598fed6942c9eef7f46c2f04dd40861ed227b533041c5efb6f6fde442bdbad718aa563ef0c SHA512 9def40a4df1d20497050c2badedb8b8828d67793b465855405fcebdd04d624b6c3314347c93db07acbff0262a41e68290365d2865945138468cf5ba4419594db

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.114.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.114.ebuild
new file mode 100644
index 00000000000..289552d0f2d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.114.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.114
+
+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[@]}"
+}