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

[Michał Górny]

commit:     ae8c4670e2b9e5cd2bd175019efd9fdf78727f76
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 14:46:10 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:16:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8c4670

sys-kernel/gentoo-kernel: Bump to 5.4.185

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.4.185.ebuild     | 100 +++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ed1baf40d4a3..28463529cf9d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-5.4-187.base.tar.xz 4470704 BLAKE2B 
e2f4b367d5f0e1987f8b1f5bc197
 DIST genpatches-5.4-187.extras.tar.xz 1816 BLAKE2B 
692938afa4bf40af4bb53d08aeae6aaa4315bf854ac64d411ec49e39aa88abebc369168860223b319e04a9f59c1883b3a66199892d41d736fd2fd474f1b7ad29
 SHA512 
c0443e129d01f4a2fea8bc27f6898afa2b851d4b198f03cdbfdf921a11574187b4db08696fdf7288d7a859748921216f0abf30944770d7b6b3f6ddba2d091699
 DIST genpatches-5.4-188.base.tar.xz 4484468 BLAKE2B 
9e6b7cc45fb779ebefc977bc3db886ab6f5e6d4e1e6d331c251a9ba65d0aa90756e9ad4c483e68e29e4655c43563b0347c23944966df7e14ea33318c64fd73ee
 SHA512 
0a4d913c09714486f6f3ecd7bbedf06d4ba82d3de9e768c13b176bdf9a1546652f727c5b331f7cc56df2647d23b89cf91339cba306b6d9ac14f752dcce994d29
 DIST genpatches-5.4-188.extras.tar.xz 1812 BLAKE2B 
1260faeb54391bf0fbd3aeb54bc6e551105e13c8d8ef4bc67d385e6340feb5fcdd3fc4ee90e217beb4799c04648dff1e09a311e364e47d58d8f10bf51bd66278
 SHA512 
5ac560ce4935e7afec19e24fd97d51b9f8574670b9a59254ddb0593234e675bf8ea858813155700599385d91a4e2fc4e5668439f1bbce3d0e35be32d6987a44f
+DIST genpatches-5.4-189.base.tar.xz 4492528 BLAKE2B 
9fc86ea4e71968c77f4fe705f5e01220545becc1f062a53875e4cc451a880a2482d70c1830b98ba447c77131422cd8305f2636c702737a94cda749f0927b2706
 SHA512 
f4c9946b88d8b61df0d267d915fa047de8774603c0e98fa6ef2cbd930e5c3d83fe4755327dce54739a580d674260ce45c3cffef9180369821f947170398a5de7
+DIST genpatches-5.4-189.extras.tar.xz 1812 BLAKE2B 
04e839c3c648cebfa8e15aa956670ecfd1c7a830960e7facff9015ad37c9b8ec0a85f510a559846163a277da9b669a0512d22b45b6ac7c1dfc9fdde99acbe9da
 SHA512 
9357b36b51ffc30e92197affa4e60e0e01180c218cfdd17c91538b2ac12ca79fc534ca0b4f6a019ff3db97c8d41298fbd383d8c4c7fd0d8b1baaaac0494a330e
 DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B 
e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f
 SHA512 
5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B 
e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203
 SHA512 
225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.185.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.185.ebuild
new file mode 100644
index 000000000000..7286c7070096
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.185.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 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}/${MY_P}/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[@]}"
+}