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

[Michał Górny]

commit:     64b269930dbdb66abcc5599b35a4c45aa39ec581
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 14:28:59 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 18:41:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b26993

sys-kernel/gentoo-kernel: Bump to 5.4.231

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.4.231.ebuild     | 103 +++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9d1ec513ec57..f8b8515a5b95 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-5.4-234.base.tar.xz 5429360 BLAKE2B 
48e1199775c5174a4e25f9611f41
 DIST genpatches-5.4-234.extras.tar.xz 1812 BLAKE2B 
7f95873ce78883b4bb1e4d7769688565c5b5574e86417a8f11d822fe5d971f7e0948a08e83af6a35c0cd8d52cdd5fbfb5fa3abf03c233fa3711b3fdf19fa3dda
 SHA512 
2e49f3f75089ed6ff55c007529218b5b68712e64785cb06dcd5b0f1276a3fe3b6a2ebe2f807b586f954698bfd2c73554a462ee592e89b234e6d25c614ecfcf49
 DIST genpatches-5.4-235.base.tar.xz 5437324 BLAKE2B 
16a5f67224b3bc10792945ef379825c96a2e97faa48444b047da90e36a341b1b04930e64b8e4bd457d3ab9ef842aec1e2334dee273c4279f72eb6745b2dc4b83
 SHA512 
461ecc356eaeca967112e69d8cbadbe8d84ede7b2a3d199ba11620f9b405d5fa0506c133d15599713b74b3b5bcb000f7cca27351b8ad628c81ceae64d339d385
 DIST genpatches-5.4-235.extras.tar.xz 1812 BLAKE2B 
bc1b83082a60463da80236c4eb42590981905e35f653ab2976c9f31f4879446f65d0f123f11e45bd583fc0ef788898f38a6534e66d1a028716954020427736f4
 SHA512 
515331c1ce6d7ce76f946ab6b8443afdf47f829bdf8e486ca733854d5c984c0c99a36611cc82418b0155f9ce1276b702affec04b65c4699cd4bf796d3ef6a7d9
+DIST genpatches-5.4-236.base.tar.xz 5467512 BLAKE2B 
5c2ec5abee963eda0373e04d4f0da94d7e49b7a1fdc05f7a2f7cafba61771124503f1294289f79629afb62075855c176887f525a95a73bef4247b57915dd4877
 SHA512 
0a3ba2742ab21407ccc9060f37d528cdbe64dade85927aa1908613221973f14765a78ef6a71e157a71defcf1ee9158ffa1c2e7c082f508fc1140792e2311a073
+DIST genpatches-5.4-236.extras.tar.xz 1812 BLAKE2B 
acc781fb099315e4716cdddc4a7f7ec88bcfae2228fd63c6f8bc99b3f562baf75339129f6d8e5970f5a812f6523fbe316992e1bb1606d6e06e5ca769ea1b5535
 SHA512 
5d772754922bf7eb2e21eac8fd597ba8c6211565a4d96a7bda6df68e089654b908bc09cd884c6e570836814ee75c84252d26228a20d138577e7717c498edad86
 DIST genpatches-6.1-10.base.tar.xz 591388 BLAKE2B 
5352d923a1df59c38cd1061ea9454041143a9786e4c81c195edb0e50ae9490f9629f2806482246c417db294a2ad9b643c9a6b38403c46c1b135c73a94506e6f2
 SHA512 
5ed3ea65e2ad63f4d59241b8e11f4de068564e5079c7fd6d511e9636867843e517b662f744577b615cbd572fa7313af260fb07c5c4e39e0cd114e4f315d3d777
 DIST genpatches-6.1-10.extras.tar.xz 3804 BLAKE2B 
2a713dcd63d5946368d0bf88fee904b05f3fceac266173aa3016c528cfb40eff98f7aeaca2fd67e52a02a39b80b430fd55c8abd65ff5e61dbb6e6cd6ee757282
 SHA512 
152c134efcd7ceeb233bd7d9211a871d6b4f633e4782ac73657d583e4f149763e37ad7cf0f19efbf1c4c25fc50f3c67167b15f024eabfcfcb016b1cb23c36ae0
 DIST genpatches-6.1-11.base.tar.xz 672088 BLAKE2B 
29cabedf32ea3f8cb1ca75bde23955e4cc23c54ac93f8dbe66adbca1b1af4e5c6b54e60b84ee95bf48f9432a844aea279e89acb3a15cd8ab67e5453fb179c9d4
 SHA512 
a840a15204d1f1fd9f809cabe01cb0e37756cf1ac89181b29306e6a3b0ea3ce5e8b48b2402804b096106d0c4a0eb2b318e4ad3eadfeee4f266e6c3b6c259a6d2

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.231.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.231.ebuild
new file mode 100644
index 000000000000..aab83b3a5cd9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.231.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g6
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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/projg2/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[@]}"
+}