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

[Michał Górny]

commit:     f6c069bdb5e347ee4856368c58a02110f115e578
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 12:34:31 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 12 16:35:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c069bd

sys-kernel/gentoo-kernel: Bump to 5.4.193

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 7b0c3823215e..89874ffc7ddb 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-195.base.tar.xz 4639264 BLAKE2B 
7a3558a8bb125d616bf10dc29045
 DIST genpatches-5.4-195.extras.tar.xz 1812 BLAKE2B 
d285c26f84b2275007c3ad4aab1d7fde0ba467ec07863fdf4962737b06bbedbb452a8601f3aea28fd4086b2e80680422e6cbc749cebe49918a37e1c790532359
 SHA512 
f1cc2db130045affd76c6e2fbd8c4d2806b20faa2feae80e8f88d821d4384ab0ecab3ae66d692666107e23c3deb6cb70231b6251be1e2e5f00e880af48228615
 DIST genpatches-5.4-196.base.tar.xz 4653468 BLAKE2B 
7fa30744a8cce84a029c74f23809dbf04303b68266e55518968f4ba5ae9961cbab877dcb3a0a014368aa75981d194a7e63957dc1404536d97654f5cf42a4317d
 SHA512 
644fd52e5f3f83fd244e1ffa056ed89d242ad5a99727f918f10e9722a176cb99e437306261e3b780e016d72550e04085a650a4f7ade51c4845c4707768b9e86e
 DIST genpatches-5.4-196.extras.tar.xz 1812 BLAKE2B 
1c50cf56732036261aac0095512c32fa5fda3ce5d3d405994f750b2a6a7efb539e011c735d85103548294bc7e66bcb8b6874456531a0b9ac194b7a187bc63f3f
 SHA512 
308dc1aa8591b75d36a528aeec634f9be28925338cce92a364b1e941c14955567dc8d173cd3fe62b5b8eb433a97397cfc722c197e27ec26861df7a4912735d36
+DIST genpatches-5.4-197.base.tar.xz 4667616 BLAKE2B 
fe777dfe7e9301dbda973c6bbb1459c9e8ee245a729b50e528b8f58f8cccdcebe1d572217b089910eb7402473eaa6cbc39c0bdb11cad35d417d3a32d29ca5456
 SHA512 
eb05870e88d1b1e6740abe669ae5de2994283e95e427ccf55c7f184be5e36e20bc52d74e5ff669ea316add4d62da6a59bacb1a689c0f30a8c0a0dfb3c139b639
+DIST genpatches-5.4-197.extras.tar.xz 1812 BLAKE2B 
8aa22afa5b4f9cb1cf2a112095a694f6145ec9c3b4be99daff9a1fbfab6e1742d45a8f34bfb407d6f7622bc9f934bcf780d8ddfb4f2add165329cf397c0f08ae
 SHA512 
0b51076e9c9d17e094652288c8c0c0482a80ab233658fc84cd2db92414fef3965435a6718839b27361f0de802e70457f8ce32e9a7db33b30858e681a392d5355
 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.14 242650 BLAKE2B 
b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694
 SHA512 
2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.193.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.193.ebuild
new file mode 100644
index 000000000000..4a10594a85f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.193.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[@]}"
+}