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

[Michał Górny]

commit:     d3afbf8e319bd11b1a0ca8b9b63a9326b81e73b5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 13:01:03 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 17:04:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3afbf8e

sys-kernel/gentoo-kernel: Bump to 5.4.140

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9470b6f5311..bfddf082002 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -40,6 +40,8 @@ DIST genpatches-5.4-142.base.tar.xz 3810892 BLAKE2B 
66afbcd352ba038920281b3220f4
 DIST genpatches-5.4-142.extras.tar.xz 1788 BLAKE2B 
a8bed6a689141fdeb3fbd857b0b753a4d317298205b0961c9bbedbf7064d55d05ad3ad437fe8d2e182898063f0fbbdd05ad32b52173bafb6e7e8155ebaf8e698
 SHA512 
e288e2047cbdde57a8d20297b6d669a107b2a0185f3351972f0df8921eaecd3f0971ad68cb7989f6a265a324c13095374cf90d01d26982e7a757e5fd0b2ebbe3
 DIST genpatches-5.4-143.base.tar.xz 3817644 BLAKE2B 
62ddf9fe77a4da96e1f47bc8d5db279ad30c9c2a55a4307b3340128fa6e65b717c1d3d7a96b67342f75d34d032861933c62a83ea56e6989ca72ff1a5d9331692
 SHA512 
500e31463c4131ab2d54e8e1b449f2f75899064ee999530d83914f2f4f6587af2ef9a2198b0ab84a695da48203d2818f7bf1054fdb5f842d84486ab60f764cdf
 DIST genpatches-5.4-143.extras.tar.xz 1788 BLAKE2B 
6dc4357139177d305b6989346fd3ed5f75310037db5ee32c2634da6b1a6290726bd718892cd66f976a2c181b430b8e297f1bef2e1134726a23c964fbdea7692c
 SHA512 
3df9af7e73880821afa994647c8d029a4cd453629ab24b93d971e6c4c0ee1247edb924f783e4393ebfb0abd8afad7755331cd5e9fbd0c06c0550399367c85ca3
+DIST genpatches-5.4-144.base.tar.xz 3836196 BLAKE2B 
a1240eb039b5d124ba71cff8bb3abd7cc81d37e5ecaaac1d7dc864f4590a0eceed026b8123335e0c6ba7ff54654ea447c252a7be6d345c284da975a6754ff543
 SHA512 
b9c3ec33cfb47e632a983f72a8c4962fd4f838449ff7bf4344b98ff730d8e5b2fcbc4d2a1a9e65ffc8a15a09f3bbc965ce3276897c401289768783d24503d0a7
+DIST genpatches-5.4-144.extras.tar.xz 1788 BLAKE2B 
5dea6c811540cb24842a4aaf9e93ee512cbab64d1fd02b0e835a23e65014f1aa86a70bf44b866d250ae68081257ddd9e5e52d8dcd8a375da51d0a8bd288e922e
 SHA512 
1f7afb479920d72e20db0bd7d1a828ba88fc4ca5ada3397774546273f7ffdf368870780842e0706211ff825a872ec3b35ffff9ee3f6ee22fd6585e20a6ea64ee
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B 
b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f
 SHA512 
5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 
9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48
 SHA512 
55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B 
e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203
 SHA512 
225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.140.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.140.ebuild
new file mode 100644
index 00000000000..1bf22439675
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.140.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##*.} + 4 ))
+# 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/pahole )"
+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[@]}"
+}