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

[Michał Górny]

commit:     4ca76c4733df6b325afc67b0a56c50f3d3d7fd37
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 17:53:15 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 05:08:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca76c47

sys-kernel/gentoo-kernel: Bump to 5.4.248

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index c00592d228b7..a751109f3de2 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.4-253.base.tar.xz 5855284 BLAKE2B 
af86d19abc80339eb77bad98df5f
 DIST genpatches-5.4-253.extras.tar.xz 1816 BLAKE2B 
2d3492cefc1abb1b5f35c375afb99892eaab0b90f2b5624560b5dfa4b89bc6eff729ed81737e04e33f78e66b74835a8dee260cca14261c5d2a88644b1b30f8c5
 SHA512 
31a201024441c55f5477b431aa94a2fe4c98977bb9c1a359af07519b8a204f16189f0595bf71aaddbb88c88e73ef918dc3943bc0a17a2a573cf34dd68dcbb211
 DIST genpatches-5.4-254.base.tar.xz 5863304 BLAKE2B 
5f2004de314bb1d7d029eace7ff48b66c2109ff8f8aadb66f1919c04ac008da386a9a79909d8e27713269282ea4e9f72995712f8ff360fdd865061276fdfe4e1
 SHA512 
c9466b35a804cdc483f7cfe111d4da24c7baceeae240ac3cb803a93f59fde9d2f8782c839cdea2bb09c111e66438ce13ae920be8b1e00a06c705c6c9fc342ed3
 DIST genpatches-5.4-254.extras.tar.xz 1812 BLAKE2B 
74d4d513b336aa79c8062560f24ef96638f2fe2d9aedca7dcb0ebfe5b202d0acbe848508c98dacc13d7ac11113b36ba73347f71b63ee6fd8e08706b3246bea5f
 SHA512 
ec766f11f8dbfc63fec33cb3287bc103a8db0857124650f0e99a8f24ec46348e8938b9c70d7d24c3d528eb82df4f8c60959d6f5650c420446172cbf6932f7207
+DIST genpatches-5.4-255.base.tar.xz 5936432 BLAKE2B 
2e9211cf49ea349f00ed7aebf0af3ff36a858359a20d4691898ecbe2c7b3158ef81d7c2b4ba133d19aca0cc5b986196a5ea1ea6d3ac83aa6176a2aa36f8f3410
 SHA512 
1c2fa60f1de83ece831d9c553c81c2c798f3c3d6507d054d35e6be207819daa3b1137176ad39fff9ba148d99e1fbeb1b33f422e44e362bf489c1e70b952474c6
+DIST genpatches-5.4-255.extras.tar.xz 1812 BLAKE2B 
0587b02c09b3a70503fd3025ffea3b014e8d4020fb1b765c874dca27369282537f1a42562e1f12c7bc5e303bf8c7b6548750ced89743447007d04f3ec07d2a86
 SHA512 
884978d503a02f21ab2f5d9463c7efb9cd8c5db410dc6c3e18100fcb03b49543722947bb49119026cfff543308c5d0f3098e9a7c5647defb92486798522dec21
 DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 
21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd
 SHA512 
b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B 
ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde
 SHA512 
ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B 
da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26
 SHA512 
528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.248.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.248.ebuild
new file mode 100644
index 000000000000..c3b86af3193b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.248.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##*.} + 7 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g7
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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[@]}"
+}