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

[Michał Górny]

commit:     1885a53cf37e535f603347a1daf54dec7fda809b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:33:21 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 18:49:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1885a53c

sys-kernel/gentoo-kernel: Bump to 5.4.186

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 5d457d1b9fbb..eaea1e0a4680 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-5.4-188.base.tar.xz 4484468 BLAKE2B 
9e6b7cc45fb779ebefc977bc3db8
 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 genpatches-5.4-190.base.tar.xz 4508904 BLAKE2B 
89aa6c02b3f145a6b5efc42fc880c297e1a4f685f622d6554c3a8a3a614c980bbc3d76b7b4e57e54d98db7279cc4a979a441d1ce4a0812380a677dc99aed48db
 SHA512 
b9955dcc6ef00928b0dfd0ee4e13c5646068c488f0b4ded998a47d73532aa6fcb615c34415eefa8f70a2a850b42fc13f0c0b753ddadece6a10737c628238af7b
+DIST genpatches-5.4-190.extras.tar.xz 1816 BLAKE2B 
40fb8b5f71a95cc9696b36d49d8d59c22a0408b3ed16e50bc2661cdd65572f2d7f77845c98fac939c7c4e4a768435f16b8fa4a72a26f0e152329e82d9f9a39af
 SHA512 
ce1b57535f747925dac1e117bf6037cd41c5ad984a3e5747baec4f6214debadf084f375742efa763db6b823309e09c6b190c01253fb9d434773ae5a7bc40e191
 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 gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.186.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.186.ebuild
new file mode 100644
index 000000000000..4a10594a85f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.186.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=g1
+
+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/${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[@]}"
+}