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

[Michał Górny]

commit:     6f94a0ded2c09d3251340b4a864ad95743338626
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 05:14:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 14:13:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f94a0de

sys-kernel/gentoo-kernel: Bump to 5.4.198

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.4.198.ebuild     | 100 +++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 874d05f0a8b4..44a29f38d679 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 
8420d667947cf912a8d641958137
 DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B 
f9d3d87c5aad19869ae7d1c82e1303ce62b5f10cd15328e4839bf7a7b39a2f571ec8b47dd65afa48f8d3ce98113a150058c59aea869f717a0f89316074af1d83
 SHA512 
17ce2facd53633f3059d9472a076fc57e320cbe802ea853fc91734d88e29a30b54dca75e78c7173d3333be5b96add590af89b089426059728473167408f65e5c
 DIST genpatches-5.4-201.base.tar.xz 4708884 BLAKE2B 
3d6d82c90f3b8e2cffa9d9c1cd5bbe74536d44cd42c5d870272b8e87a2a99f16d338f8c28511864be87f739df53f3bd3bb2f7313b4b04f78fac2057778d5d439
 SHA512 
5ebe9454b61142e87e5384a5718399c4c99b059a8bfa0db638f20f2157eb2f67117d58f4d046bfed09725ba809686d93a382ce1acd63520b16ee1d8820530729
 DIST genpatches-5.4-201.extras.tar.xz 1812 BLAKE2B 
4cb4f2605dcf2e374521931bbe92026246513251f53c94494d076f7da87a85dd5a2c27f4e97e72262853a90905a4a7b2d842258eeff573a8a3292fbf30c35c73
 SHA512 
a74d28f5014b43422cdfd8ea7a08b71faa6f0243cc1ea409e199d81e995e14cb6a849d3624bd766cf31f12a44650945aae645f37ea98079baa1d7fca6c89981e
+DIST genpatches-5.4-202.base.tar.xz 4790140 BLAKE2B 
2ea183e7c63ce48f2d418ba4606782eae8aeaefac556f93a9e3358d1eb62609f431b973f0d54c006cf723e4172d73a549ed00229a82dd4f1e3717951b0cb8a3b
 SHA512 
29f6a7c0fc679273180637cd70791b19dd1a6a87f66c46a29df2ed5fa01a5c043202853c2becf6050f4cdfed0e7ef2a7dcfbcf934623b85578a45ed3746a2fc9
+DIST genpatches-5.4-202.extras.tar.xz 1812 BLAKE2B 
710012cf071fc8e65775bf36c372bf1d6743824061e8ba42cce58440dcb4e207ba5a97eac16e19c0898b991cb39e327ac0417f90e5b8affad9937c7030361e60
 SHA512 
75d828543b8a15e32bfde13e1fef6fbf83440344464245b77e401a69968d33de459fab3bd7668838650cca9aea3475139f3206001a119463475dd091bdca2a48
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 
94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1
 SHA512 
fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild
new file mode 100644
index 000000000000..4a10594a85f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 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=g1
+
+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/${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 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+       debug? ( dev-util/pahole )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+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
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .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[@]}"
+}