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

[Michał Górny]

commit:     f4e50168befc166793e21c0f77810e3a7bf68d07
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 14:05:26 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:33:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e50168

sys-kernel/gentoo-kernel: Bump to 5.4.163

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.163.ebuild     | 91 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 1c442a5c4855..1306a1b51346 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-165.base.tar.xz 4172064 BLAKE2B 
5533ca691df2b2eae12f1ddfbdd4
 DIST genpatches-5.4-165.extras.tar.xz 1788 BLAKE2B 
b724b539ecc76ffb7ed1186b71ae33ed066ddc823647c6da87e6afc3c0348bef83ce7cbade88f80579e00de1d2c32af76e5756f71d617c70714656ee60f2b295
 SHA512 
428c5204967d8bcef77c80c3146294fafe676501e72187c8a5c6a6882cde732635bd422ae690cbf365bdf033891a0f54605e953daf542251692af92a873f06b1
 DIST genpatches-5.4-166.base.tar.xz 4193772 BLAKE2B 
0a06f3f716f07f15a01f96fc0f736300a90a7f5be47f1cea7c9c245bdb93f8d255178d0b6b2d1ddf015ef1b51d2f86ee1fb9f45aa17f91ccad41601069d15632
 SHA512 
ce3ecaea43b7cd15af93a3e4076bc6cac9815f820891ba4b4127a4f8581d812a4c6adbce34cb284d189110df34f64d61d4a7c2619ad0da62ecda94185230aec2
 DIST genpatches-5.4-166.extras.tar.xz 1784 BLAKE2B 
29955fdfe9d1f4a9f373cab61b9931a3f4d816e78766db02cb942951283ee5ba1968d3ed208164681fed488126210d93cf20731fe0b4e1d0274333bab75da360
 SHA512 
799d99c155d060e959728c311df73c6ae184be5a8a7b113f8714ccca0fc30a7b390bc534c138b6d37e00b7ae2e2277229caeefa047dc3b110df9d2e7a74b2ee6
+DIST genpatches-5.4-167.base.tar.xz 4225548 BLAKE2B 
8ab7df3c0ef717a37751b84b201f48d9fee77b4fdc6469716b26dca2ebfc0a91cb4622362de8a498c6b92ccefaa95b9810b2fa1eeaf0675ec01e5933dae8a181
 SHA512 
8566f02ed644781c21a4ceb555754d45ecdf3c12fad23482ea7faa39521015c113cf7cd1ce6beaacb6dce8f0f812a839075e8fe13d8889810cd3e29bd9b75ca2
+DIST genpatches-5.4-167.extras.tar.xz 1788 BLAKE2B 
69a8d7c8e5a4fd42c3ff531ce9e39db68c41e43205f91d0408231067d79776dda65f7348fe2c1b5a31fbc0f01eeeb09dbabbbc4c053b060738f5a5dadc885bbf
 SHA512 
f64a077bf5142baf282c847cc17e0e47c22e7dfcd7241c6f240aa42de40714799a73fbaba31b9b502ebdaeeab8e2f0373227f1eb641e10157f307aa49df9d351
 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.163.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.163.ebuild
new file mode 100644
index 000000000000..d08e589ffcc8
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.163.ebuild
@@ -0,0 +1,91 @@
+# 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 ~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
+                       ;;
+               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[@]}"
+}