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

[Michał Górny]

commit:     744bc0b7d82b161174217d2eb132fa6282aea3a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:38:16 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744bc0b7

sys-kernel/gentoo-kernel: Bump to 5.4.228

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 17013e9c1f16..eb0705b89354 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-5.4-231.base.tar.xz 5272360 BLAKE2B 
9b7a19691ddb0b06bb5642d580cc
 DIST genpatches-5.4-231.extras.tar.xz 1816 BLAKE2B 
7200d64f7ac5ecbf7bcfa77cb5ccad1f52d77b17ceedf688bd8a7721b915efef81be0a67ec87ffff141980eff31a36040c709597c3f9777825d054e547c9f748
 SHA512 
75cc387c24219f62854cc786da87a88eef2567f8798e278e1abe0c3f2689779ee780957339e7a782250920b998b0df4d31b54f01bbd996cc1d4f498113df91a5
 DIST genpatches-5.4-232.base.tar.xz 5291236 BLAKE2B 
9f80382d51bb96d5f3b62f9a6c35159360775df3092301638f36ff2bc13f8dcd2bc18816f76d7bab8e341bf956fbd198047cdfb6d020e0c419d431e0dfcf5754
 SHA512 
e3d6f7c08667dfd3f69d862f6057b8629916c13e1a0421c254aed0462c8725c3ddfd8a75433de1f893e050a9451299281d6d5df9a4d234644e92b2dee1004074
 DIST genpatches-5.4-232.extras.tar.xz 1812 BLAKE2B 
e2ad941ec37d92e646f7c5d8da34b0bacaf98fcc96da2f43a4257a1e9d40bd8b90965655b67bca2a986249d0971c9ab27f892be5e7bc6e9013f8d8143638cb38
 SHA512 
4cf015c2847d593177f842241e67aa8125d19fd163883fe553799c3b7af6dab4c2020462c6d348478a5b539e0425e6510749c537862a67f5f8e185594b6d9d59
+DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 
357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567
 SHA512 
45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
+DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B 
abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44
 SHA512 
16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 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.228.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.228.ebuild
new file mode 100644
index 000000000000..f40d2d1c7dd7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.228.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[@]}"
+}