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

[Michał Górny]

commit:     f8325d1bd4347caee7568f4e1ec47f249207521e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 15:33:49 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 17:03:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8325d1b

sys-kernel/gentoo-kernel: Bump to 5.4.160

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 6f74643a0216..79705ae1c0ac 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -40,6 +40,8 @@ DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B 
d264f2a3cf61b8ed2a297bd8a3fb
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B 
af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8
 SHA512 
4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
 DIST genpatches-5.4-163.base.tar.xz 4096836 BLAKE2B 
706872ed4c8c5fc61e1165bb4455f32ba7e425c69ea925355286dc0c9cbe869ae295e02d79d4b2dbfb80f85ec0ca74a3d91c668de434668522a5fa6b26b9fefc
 SHA512 
934058f21db89518828a5988c3161aac4ec38f119640bd2e29ddb8e43466d8fec056b94b81d58b8518b550d264885b723b33313e10afa3d75bf37aad5fed0b45
 DIST genpatches-5.4-163.extras.tar.xz 1784 BLAKE2B 
8245663ee14482d5495bde82cc4f0bc3c37a9cd67991694b9c6790a2a9fa8fdd15f055ea8b1e61ff93e3f1ef769b110ad64fa9a64e906b9a3cae64d7ed4e0fff
 SHA512 
af68646411a8e730fc59f11c5d4cf41556bdf98c4afe524e7d2f7e022240403096d6b744e801a02e6fdaba89cca1c1e098ed5fd1ec7971475cd95b21c06db8ea
+DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 
62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39
 SHA512 
e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
+DIST genpatches-5.4-164.extras.tar.xz 1788 BLAKE2B 
a1c49d863d28e352a89a8ef344e2b9fa7d634147190ef2886e1725ffa0a0acac0a8a1a8eca633dae7213e39f6030951c7af7828449b810d32b987ee8645edfea
 SHA512 
841638c80395371d41aa45fc3cf5af0a4225e312495346514e078fe7d5e0d7dfc758e62402816ababb8f0df020206469920ec6b53fc71d3fbb6fe15cd8cb34ce
 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.4.114.tar.gz 1298 BLAKE2B 
e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203
 SHA512 
225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c

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