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

[Michał Górny]

commit:     fc48345b73f627a743025d1ffb638d3790391f0f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 14:17:09 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 20:24:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc48345b

sys-kernel/gentoo-kernel: Bump to 5.4.226

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index fbf4069b12cb..cb391bebcbbb 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B 
ede38de7b09b59ab96596aa4e47f
 DIST genpatches-5.4-229.extras.tar.xz 1812 BLAKE2B 
d5d084cd21e2a4f6235f0438e8d92746fcfbc9f86170247b00ade3d2aac99e06c4b10bbe725780e8f9644c7404e8defd360c3e9d360cac1e5c5a8a2ffb17adef
 SHA512 
c21105638451b761588caaf266d901de7a5640d72540954c3c559b675dc265cca8ea5e56de1c3c644bda4c4e09fe174ece02ed6e506d12e718e035825dda3e0d
 DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 
59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365
 SHA512 
f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 
62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a
 SHA512 
911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
+DIST genpatches-5.4-231.base.tar.xz 5272360 BLAKE2B 
9b7a19691ddb0b06bb5642d580ccf758e3a2543af7d0e8193aad6a3d7d2e51af315660194f4bcc4faf26bcc36dfdc1f96d323845af6f265d679c86b2f33a586a
 SHA512 
fc34a0b606a07bf439975766caca7aa52cfa6ae578e46ec080941c2f08b9667c9ffbf3dc0ba50bd90c7e5ea9d3e75fd7d6686934e0345d1e66228a9b0059d1e3
+DIST genpatches-5.4-231.extras.tar.xz 1816 BLAKE2B 
7200d64f7ac5ecbf7bcfa77cb5ccad1f52d77b17ceedf688bd8a7721b915efef81be0a67ec87ffff141980eff31a36040c709597c3f9777825d054e547c9f748
 SHA512 
75cc387c24219f62854cc786da87a88eef2567f8798e278e1abe0c3f2689779ee780957339e7a782250920b998b0df4d31b54f01bbd996cc1d4f498113df91a5
 DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B 
faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262
 SHA512 
c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
 DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 
392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0
 SHA512 
86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
 DIST genpatches-6.0-11.base.tar.xz 622960 BLAKE2B 
a8d35eea162ef85aec18ee2b1b57e0d67cf4fd336eb1827b4c2d81f85768ea0b633b8010d100b693d3359ffdc373d19c866383dd2fbfcae8d49cf406e9c6a56b
 SHA512 
d2f07ee7314431f324684340f84cba64c008a268ed42f481a9bc885796cf4ba1dcd787bf64eb0028f2cab98afd0226f1b56cf00c7f160fc2af25276339743b31

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.226.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.226.ebuild
new file mode 100644
index 000000000000..f40d2d1c7dd7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.226.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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[@]}"
+}