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

[Michał Górny]

commit:     e51f2636ec6b2bdce6580afbdbd8c77a0fe67231
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 06:24:26 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 13:17:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51f2636

sys-kernel/gentoo-kernel: Bump to 5.4.55

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.55.ebuild      | 84 ++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 750f281ae88..d69a8f84e99 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.4-52.base.tar.xz 1777632 BLAKE2B 458c4599bcc1351963e7470d58419
 DIST genpatches-5.4-52.extras.tar.xz 1764 BLAKE2B b81e9fec54b98cbd75483a814cbf1df30d754039e740fcd72fe9aa739e6c91e13b6107d54729b0e18acbde34f77f3bc00b4fa70e0754188dc2364e02b96a300e SHA512 e8f28f9993f79fa8dbda95b9b990d47da4a598bda0fab378c3ad478aa41558302b58f050716373341483a2eea3f9be7149fa38f2170a6eb620ab2c0def1b3b85
 DIST genpatches-5.4-53.base.tar.xz 1827188 BLAKE2B af537fc71643e9bcf7a4cacd5af6a1c1aa34b50e8fd7d677890dfe3b51823e37fb6b0b9a162aa50872a61244b470078bf092acdee1b376aedfc2f2bbb22da9e0 SHA512 240039c975defddd2a9faa1601fd85aae353252fbf496cd3cc6a5169acfda4fae51664c10f375a1b4fa1cbe7a705ab71c5f27daa196da77b7b66371a5d53fa71
 DIST genpatches-5.4-53.extras.tar.xz 1764 BLAKE2B 192b382f6309fef702204b4ae60375460587933c2e3dc2fc2aff6a2524828e956efc447b084e54538d72943d92882ded3aeabcf2bf75f34f3199490140bc2f80 SHA512 d44c1daa0b4c8661fbb66b01992ae6738b54cf32040f096bc95d6c0ea8f7cfd34e4c8f5065e7cd5d2a6d9c0b418b245aad622ad230582f45ac5859c88a46ebd0
+DIST genpatches-5.4-55.base.tar.xz 2129856 BLAKE2B a9c688be16c22e0e563c0fa3c943931ef933d0114a1a98b41305d4f566fec453a4861465d5a1605835cd7277bcaee9cf5a238ea624bfb650e389960cb1dd6292 SHA512 a3f4b23d59f6e4253d6a9b113977b7ff64fba611b33244ba69a06887a9f597fcf6c87f23d7412471e77187d01b4ae736ebbb71ebb647426e09e0051fe4493c51
+DIST genpatches-5.4-55.extras.tar.xz 1768 BLAKE2B 195b5747cee6c3302bdcc2cb9b05f0cb87c367bb63e7a0afdc93127cf2844e8babf9bd378370217d57364c9a3bd0eccf01a41b40606ef1feb96ef90e9e67f91a SHA512 32bfd86dad656b6f9878df9c7bf17557cb553e540c34ba8f4fe9bd9b4d42c006a62c29d465d91a67933e27bdbf9a1e35c3b87d95166822b48bdde2584bc8edf1
 DIST genpatches-5.7-11.base.tar.xz 532736 BLAKE2B 9f5b5d8304c22cac1e081be759a6731c5902e2afc241c79dad2518083b9d56edb34f5ca2d9b39fea84cbe0e6569314e0db84eb69027830b997a6e318b6e27c13 SHA512 43bd55fef87afc5e97fc9d4d13705f6790eca5c1874fd266da2109ea0ac913e812e156cd231d67d3494f743f2263d33292770c4be9a8009e0c6f85704d77b21e
 DIST genpatches-5.7-11.extras.tar.xz 1764 BLAKE2B 655bba046d32ee61d8b026f462e35c4e58536afbfdb37de32380a253fedceeac2da42a1366ecbe0b7e156f25319f67ad61a5eb51ba762fd8958068f1f1c0d0bf SHA512 b26c720473ffdef3ac40955692660ee4645a93e2cb86a76d1583d878c3832f3c8bdcbdc23bc6838c1d0255ec86a5671d4e205cb6e99dd5a1d64405fe0081a355
 DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild
new file mode 100644
index 00000000000..2466b1e909f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild
@@ -0,0 +1,84 @@
+# 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##*.}
+# 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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/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}
+	)
+	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 ~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
+			;;
+		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
+}