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

[Michał Górny]

commit:     4cb783bceff1612afb23875cfb62c9d5473e5f1b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 14:02:09 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 12 18:21:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb783bc

sys-kernel/gentoo-kernel: Bump to 5.4.118

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index e85db588b7d..72a827f3b88 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.4-119.base.tar.xz 3361000 BLAKE2B 
abd2482e85fd277fc2baf8def6a2
 DIST genpatches-5.4-119.extras.tar.xz 1772 BLAKE2B 
1e15bcf849d4474a3d7e4f48791a3acc3db1b8c98d08c8fbbea9086e85ddf08a5bc60e62d14d0fee54584fd383101428987e7e1fa395c8512031f9433d64455f
 SHA512 
21e3e2c73373cffc99f66519695c64140a2ec222a2377781c79a771aded878aaf299ae435f6d87430d6613760df3d79f67bb90aa4917a3ec233fb6aa04bc3305
 DIST genpatches-5.4-120.base.tar.xz 3365276 BLAKE2B 
d72fc4839a6716278fa6144c4ec33ac24dfe1689734699fbf9da96f9ca0c91630c79cc31df3e86d8661ea8cb4ed7295a31a56c6da097b2643c35a0391f8aebbf
 SHA512 
a84f804aa8287c90e23693e8eb518b041bba05f3fbb1f3bcd2f9e120c758b871e3926ab73cfe1a2363488000d4ece206b95ea73726be0900172060b8a358a855
 DIST genpatches-5.4-120.extras.tar.xz 1772 BLAKE2B 
40abc1f926eb659f257f9b1988434f752ade522ae5efb72b721015a070774a9bf1a96ecc5947c289d7793864ba55505e4e140533b6d18b094a66e5517ea856f7
 SHA512 
0f03daef6fbfafde7cc1cfc7cd75ddd5ab55942a5bfe45fee7e39324523f05a3cb1774aa572a0543913249ec2b478d0db76359b6329f90942b3b8f8dac264ec4
+DIST genpatches-5.4-121.base.tar.xz 3407340 BLAKE2B 
b6cb01e7d9663640afa9c65f13393b66b00575f71ebbef6120ef01447f580b0c9a8ad45ac924ed4550d0d331fdd2fe711ce8bdb9bec8965943de0b24d485ae01
 SHA512 
01a5fdd3645bc3abb66fa3088bf8cf3e90302ebb81090efd4e76306c32756b5f5edb42d332efc5b0ba33f8d08ed4b0bab939945334a8e7189f6b8cbedf7d9104
+DIST genpatches-5.4-121.extras.tar.xz 1768 BLAKE2B 
59572978e5e9e24ec69aee64991b794560355f522702f2b68b33c0ba74164027f62ea6bead7822458131fd8445453fe4c9ae0eb4bf60c529833a83880613b8cb
 SHA512 
22d808f23f684dd468149ab0de361a7a82e188fd2381c79b4342fcbd64ea2033251e2e7247b0d1f0aca473d899fcdaa58a072009313e68538461de7be1150197
 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 
55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa
 SHA512 
ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 
4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db
 SHA512 
a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
 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.118.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.118.ebuild
new file mode 100644
index 00000000000..289552d0f2d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.118.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.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/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[@]}"
+}