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

[Sam James]

commit:     9036c795c4595bf1c8ac5e653a1ab2614650ef0f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 21:07:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 02:22:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9036c795

sys-kernel/gentoo-kernel: Bump to 5.4.208

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 53cfcffea19b..5ee85b23c820 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -50,6 +50,8 @@ DIST genpatches-5.4-211.base.tar.xz 4898356 BLAKE2B 
be058cf67ca37dd3eecc242039e1
 DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 
3edd098fdbae33053dad710c08bafba66b3fff66e2e87935e904c6c5c4ecc2749d8f3135d10ffa6afae15711cdc92c725a08178eae6091355b81e93375d1cbc3
 SHA512 
264c25cde7a7371726350b0eeab9cc087fb0e0194e92905e1ef2ebe1467ef7ca3a0cd654b65e3fe35f49113882ab9f4041bbbd02095c935baae93b5a37f986cf
 DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B 
b09dfb8e041beb3ba5813e3f93ee02ef2fe3a6bb62bc4a9124bb19b74612ddca745e7066d9d11e520b6ab60e4a123428dae8e97ad28323e0d279173654a35f41
 SHA512 
f13c5f6d38e8b71544ee07dfbd049b611b8228d2eadb26225f0a3cb532c8aab2b321a52c17e11a732c6bbfc71586649850bb4c43b932206d7b5ce4691a0b9e2a
 DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 
8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403
 SHA512 
0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
+DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B 
ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e
 SHA512 
6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
+DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B 
b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9
 SHA512 
1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
 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 kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.ebuild
new file mode 100644
index 000000000000..bf4c0106cbb7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.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##*.} + 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/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[@]}"
+}