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

[Michał Górny]

commit:     5d3b2568328c8f10a6193bc322604ba24d5c76a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 12:06:44 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 16:21:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3b2568

sys-kernel/gentoo-kernel: Bump to 5.4.229

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ce6cc35912a9..aac2d9de55d4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 
1a70c672f4ceda221611ba1bad20
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 
12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903
 SHA512 
6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
 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-5.4-234.base.tar.xz 5429360 BLAKE2B 
48e1199775c5174a4e25f9611f410f8c3959920b3af6d4a5639497560f9a7ca34210c3f7db7c5e279432e1562956528690f5360dfeaaf7f99227f74d8e8d04c9
 SHA512 
c41fefd72aea785fb40ae95e47019d07c73bb4a07c286e732f7bbaa4b1cc3eca0dc53cf088387998ba1a9bb791e9e021d6246d8ceb9b87dc6d7fc6cbecc6dce9
+DIST genpatches-5.4-234.extras.tar.xz 1812 BLAKE2B 
7f95873ce78883b4bb1e4d7769688565c5b5574e86417a8f11d822fe5d971f7e0948a08e83af6a35c0cd8d52cdd5fbfb5fa3abf03c233fa3711b3fdf19fa3dda
 SHA512 
2e49f3f75089ed6ff55c007529218b5b68712e64785cb06dcd5b0f1276a3fe3b6a2ebe2f807b586f954698bfd2c73554a462ee592e89b234e6d25c614ecfcf49
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 
29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149
 SHA512 
d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B 
af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818
 SHA512 
22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.229.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.229.ebuild
new file mode 100644
index 000000000000..a91d87ff5d2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.229.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2023 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=g5
+
+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[@]}"
+}