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

[Michał Górny]

commit:     da9e67a61690dd73ff7acb48913881605c4bef07
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 16:22:25 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 19:36:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9e67a6

sys-kernel/gentoo-kernel: Bump to 5.4.111

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.111.ebuild     | 97 ++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 3a240bdcdb0..f114f2a88f7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 
11c4a33da1081ce777019604d067
 DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 
7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722
 SHA512 
6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c
 DIST genpatches-5.4-113.base.tar.xz 3302232 BLAKE2B 
106c01266550457aba13bff1ec60b9d0cbab403757f780f7e9b69cd1697b28dd6624fbbb78462891bf8e51b4eef2fb1d9c0ed4cc8909996bc629b9ff5164043e
 SHA512 
5cc835c4150b4a1fa9ac8090143e75274c025c43e4998748f056e5d0fbf048a354f20bb3f66a3628772c1ab2ff9f6da1b4c7547d6bd6543e5a299948a9debdc4
 DIST genpatches-5.4-113.extras.tar.xz 1768 BLAKE2B 
e2546e7a593e709e3994efb176853f8212a33324c048412b14c037b0f55b6d216bdb8231764066250f1e6b96048ba2f8ca743f51041e71c1d512741e0b58b069
 SHA512 
21f45e81787d150936dc4a330d28baaf372b7f9e241b93739708667107cb42c525a8b97eba4afebe3638204f67111ce14d90cfa2876e0a67d06840d4606f78cf
+DIST genpatches-5.4-114.base.tar.xz 3305288 BLAKE2B 
345acf1ef846178a5a70f385f3d9c2dea25b1892fb755cbd43c78f3aa553097294549a5f24e9552ab0d37d5086fb58e98b72db5230ab8506e725a0908edd5143
 SHA512 
fdbb6b9c10eafc3069b72460db1209843ec4d4d024548a384dca72592e3c6e5e4eb3b9b34058266499da26caf0a168a1469de7bf4934e0855c6a5db1f4d8d69e
+DIST genpatches-5.4-114.extras.tar.xz 1768 BLAKE2B 
506b391e93021d06af44ad90a1da1937aa45e51938220d9de89a525a073cee83b43966b546cfb6dedcc631a07134e55acb7e208a64a117d41f88db99273ba9a7
 SHA512 
9d13965d4a2db92647946c4126bd40d5a05ac0d848aedda82a6ea8a19f562ec1d8debc13594332cb1fc2a3bac9df76b08c5f666d5bf79b4285483c0d7ca02ab7
 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 
55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa
 SHA512 
ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 
50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06
 SHA512 
ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.111.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.111.ebuild
new file mode 100644
index 00000000000..103fdd6ce9c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.111.ebuild
@@ -0,0 +1,97 @@
+# 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##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+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/dwarves )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+       ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+       ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+       kernel-install_pkg_pretend
+}
+
+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[@]}"
+}