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

[Michał Górny]

commit:     a0fad534ed57142b802a6050896bedac4a85946b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 12:14:26 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 14:16:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0fad534

sys-kernel/gentoo-kernel: Bump to 5.4.61

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.61.ebuild      | 91 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 24ff7ae1a8a..c23e4c8516d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.4-61.base.tar.xz 2186332 BLAKE2B f0063cb381a98330178dcf4ffa017ae9262f0406a1d4801b8e60a0300c51238a57b502ec8f72ac30e7b8618e8d54e6a56afdc9513fd8f896fc3129cbe3532446 SHA512 0733161227e3d1f3bb179a4ae8132183ef858166a0521e28669b5e01bf660a924b0b4758268ea4271abaf4bd51b8a49d0ac300173873087820697de5e53452b2
 DIST genpatches-5.4-61.extras.tar.xz 1764 BLAKE2B eeb60ddb3ac1b28aaccca2820d107dc65629b61460073b1e281903b04759f3c1a66ee8dca35459d1ea81fc75410709c8010c3c16aedf802fcc626cf47534ead0 SHA512 35a93c028932e1e6313ccce7fe0aa5277e57cad6c61418a436432aea5a3937e4621d72ae4d2e9b28c7b26342eaf0e63bdd9e55362d9f7b0aa4bb6a64b0c59c37
+DIST genpatches-5.4-62.base.tar.xz 2210192 BLAKE2B 5aa23923418095dad7570323e6bf853a3f718a527e15c56cbb7f177e1c03f814d741c6ba3888b9fbd40af418d9400999995469f83548a220f0efed0635217f86 SHA512 e4622bdf08e4b678eb6701a6284a5d85e0bf91973ba0e4f797c6dd4e3a14a8b34879eb7561bc38a183d72281a18cadddd4d4caf0eb8fe7acf49bd0fc823fb329
+DIST genpatches-5.4-62.extras.tar.xz 1768 BLAKE2B 6381f43f1f0bc497cfea4451538cd4a6900002a40031f5a726d0dfcd8da8ab1a8c2af4403810d2c6f0377ac5a1bcf799d43e42141361ab684e7a63a11e31bf84 SHA512 efbe0418614bcc2674040e4db0a137760f719793cab7e57cb237ff85ecffe1521a056c6c2ffda2c7efd7e47a0b914a06e87f92d73fbb754b41dfa63a88e7d4ea
 DIST genpatches-5.7-18.base.tar.xz 778720 BLAKE2B 384315c8e0e23db1137f73d6d60bc6f681d7b74e23e2b5288ad741ae8f005255164074c08a4ece67667d5eaff15dd0f955fb2eb23d9745c8647ce7761aad3f47 SHA512 8c36cb71a02d9bff7d3257c527c16191a8ba05e08e4cd836047e97264d93cd93343d13e2a550f2b8321d638a00069d8108296240c7d2656023185c80ad640c0d
 DIST genpatches-5.7-18.extras.tar.xz 1768 BLAKE2B 7312c4b26f1e3aaa51b8a8e67f9fade727b1ec6dbcc256d581061ea6ab878a47dcecfe6d949d677500a49d62928ce4a8c6aae75ce618b9555fcf7fa11fee4ecc SHA512 6b4459fef57765cf67503265ea094ffebbf5f2f9db7c753e1182f524f44981e9b047b6a1661f45b9d99f39e2c2ec57bb1a93e35dfc4a62997d9b629728c2b5c6
 DIST genpatches-5.8-5.base.tar.xz 216176 BLAKE2B 8c57c2b91b6a395b490fedcee8e0f5ba8c7698903d0e1017fb66bb3d5ced1c6675fcd6e7ecc2405ccd237fd9ef4c641b10a0b4c32403c757ada5ccec3dbf0f26 SHA512 64bf8a331ba97a1d86159dff23c46c94c63f07158e66f9e86b02de6cc1a4476064fb6a924573c93fa117ea88bf6d6bb05f89c82c1883700af9fcdbbfaa5b72bc

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
new file mode 100644
index 00000000000..5c7d8392a2d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2020 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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	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}
+	)
+	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 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}