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

[Michał Górny]

commit:     ab697b6e747da5003e5f39e05416686905dbb794
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 15:37:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 19:23:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab697b6e

sys-kernel/gentoo-kernel: Bump to 5.4.216

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index df8b51a0c2a3..d61a72f8d59f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-219.base.tar.xz 5057112 BLAKE2B 
2abaf4161586e089d1993edee633
 DIST genpatches-5.4-219.extras.tar.xz 1812 BLAKE2B 
0e80f8a4b52959abdea92d2a9a596153ebbdd79a1c1b0aa66068e51009167b4531a76c4f71b490b50650c062f02aba5ba6113401c69ccb64afbde0f29fc2f5a9
 SHA512 
3ca23ca0d6ed2726d8b1161f920027a776973d99ad174c6e46c3e69d0eec7ecb609b3d846a806ba6b5a7b2da3842465ca50b3dce9b62cff33b298bcdb004ecab
 DIST genpatches-5.4-220.base.tar.xz 5083772 BLAKE2B 
643bbad38a1dc2d6140db59f2e747e47933621eda360072063b840c6ad7d83e3ebcb055660a4e24a3b5db24d42d6d86a1f7c56617d12a275f5595c80baa80d2a
 SHA512 
82e5edf08d9b338653c4bd25ec6c9643e91cbe9bad045a37987ea9216d1ad5cdd81c873bfb09cd87350ddf55b1126efa936d8d8afee8419901bebab1c78b7569
 DIST genpatches-5.4-220.extras.tar.xz 1812 BLAKE2B 
59356642113a6ea0d2756a317a1a02fe375ca4bd1efd70ae0ca5093eea05bb00af062f945db1719be3eba11b358e80fe7764aa8e62df1d3259d6ac1ea2b95152
 SHA512 
b9ba7d70b577367316f0c9721e0783798f5c2c023eb3ccb9f95907963c79963b72a65338674bed7ddba3fc75cf10e330a4ae6a90f0ea788aa15f3ec1a042850f
+DIST genpatches-5.4-221.base.tar.xz 5091000 BLAKE2B 
ec89ca0a2c657c41784df399249da24f09a3aa08592815e17750365e09e49a7980163f27e2364f49edf35be7ccb80ec123d99693e1207f9d1561ae54687a1daa
 SHA512 
0abb4f2fdb5e9211b83d5658fb55b62b3fd9dd93adc2c38e158c3edb6018f5daa0fe7fff3ef60b971d3307c4f1954d50c03172cfeff90643caab051863a58b74
+DIST genpatches-5.4-221.extras.tar.xz 1812 BLAKE2B 
cf6270b24135f9b56a82547584a500d360cf0574030028f25af975951e5e3c991700977029d2a83190465e797eb27763885f3a0101483e3ac504927346cbf040
 SHA512 
b5925915b82583eb384a716d486dc5bf1562a08c7ddea932a583d69714a9c359d868993b564c0a98a0ed472c761449fba2e54cf7c4e84f250e55bdb07da4c1a4
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 
965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa
 SHA512 
d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 
00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7
 SHA512 
44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.216.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.216.ebuild
new file mode 100644
index 000000000000..5fa543cace37
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.216.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# 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/projg2/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[@]}"
+}