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

[Michał Górny]

commit:     d45d4847225258e4de7f11e5f4db93cf737e755b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 13:04:29 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 16:41:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45d4847

sys-kernel/gentoo-kernel: Bump to 5.4.167

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.167.ebuild     | 96 ++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ecb1be4ada0f..3ff7929f8ca8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -52,6 +52,8 @@ DIST genpatches-5.4-168.base.tar.xz 4237544 BLAKE2B 
302f72ad789134fbd008effd1949
 DIST genpatches-5.4-168.extras.tar.xz 1788 BLAKE2B 
e99f5ef8b46b5cdf0a47426f70e9811a3172c3ca005e167ae85bf3ec134cc9dfbcd4ca14c24148e0cf9183550a443018ff3c7a34d8a5d1936ea9ed4a82325000
 SHA512 
f8c8574668dc81f2f1bb225de55dd0e3a37b22becfe46bb9516c67422dcf46a44f70b23c7c4a1549e0caa28f8a69042076a6ffcaee3dd442be63bc343c07e5d9
 DIST genpatches-5.4-170.base.tar.xz 4264172 BLAKE2B 
e0c911b0f78caf914d204f3925ca6168feb11c6f6c89d5eb83398847c050ec4fbd7bc397bd7c921dc25e587e85c7233fa786efbe81344945de0a129385d3e258
 SHA512 
58d02127525031a8414679e6a499be178138b583dabaa232e24189de8aa69d1eabb772804179c0e8c895f8e90da373f1b22a57a59574cee3387f5e6d34cc9da4
 DIST genpatches-5.4-170.extras.tar.xz 1788 BLAKE2B 
fc12d252ce429b286a59f815c7fe95a3e7910717e8782ba732c387b3916235e79d817c506927965cc9090a948a0206dd627f770750fa688e122eeddcc62d68f2
 SHA512 
0536a4fa513fe4d4c7f90697cf27e501605087eb6c32eb3ef6d0888d84d227c2fa0345dbec790ec273583abb4cb4d7f878ec569ebc88455fab689aedc4d53b24
+DIST genpatches-5.4-171.base.tar.xz 4266980 BLAKE2B 
fbe50a31c7bdaa077c8f6d63884b2b2f3124d1d14d54d2aa169a48e06a6f9cf03bfbe85ee43708b078ae91190331493433e42a01ff87c5a791bee4afc2c12299
 SHA512 
e8e2e28f84676e9a1456480e742123e514df5716d29a9ee5d68e7992f860068e9f27367caef7118e013a5fb8b1b30f6db6ad4361397c9c55b20fa23738f77792
+DIST genpatches-5.4-171.extras.tar.xz 1788 BLAKE2B 
af90cfac89188a1811ba38fde5f636de693e11fcab2ccbb493d74943cb6eb2f1bcacc9fc02611983abb8bc27db97096a029d4857f6ab5ec59ee1e1a2d320a95c
 SHA512 
798e5cb1459369c8ded84f8ac993b8e60ccafd4b2e31be5a20f9c772bc2166c021713517f18a337075f7e9f3fa6c54e25be038d3f289ae334a6f868a5bf71197
 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.15.5.tar.gz 4128 BLAKE2B 
e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f
 SHA512 
5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.167.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.167.ebuild
new file mode 100644
index 000000000000..568476caff2f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.167.ebuild
@@ -0,0 +1,96 @@
+# 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 ~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}"/linux-*/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[@]}"
+}