commit:     26846aead3cbc216c3f64ce92deb3c7331c45b75
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 13:39:50 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 16:57:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26846aea

sys-kernel/gentoo-kernel: Bump to 5.15.23

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.23.ebuild     | 126 +++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 21d74006371b..d71be5fe930c 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.15-23.base.tar.xz 986960 BLAKE2B 
8c64fb7038c358c4249af8d9274bf
 DIST genpatches-5.15-23.extras.tar.xz 3876 BLAKE2B 
d41bee55c7c742a138bacfb45459f6449a80521b6857fdc55f675cf2434102176c493b9239ba73ab2d07df3062d995f9cfa76a168ad4913e5623453496519464
 SHA512 
3171e72c60211f2c331959851d85954ad94c947884408934375a4b495fe82c35f66c7408e6b3edff18ceb6888819c9f64b13a8b7c9433c80c802cf0316bf222e
 DIST genpatches-5.15-24.base.tar.xz 1017424 BLAKE2B 
97132a2c8902493e4ce76861880f580ee6b37f4cd3facd1296a3d7b207c7a7ba014bb3903465e16e8cae3cfa6341f15aedccd0a72eb8017320ca91b5b7d4ac63
 SHA512 
b88f25da20d309e16c13adca272114237f1082d2272631d960e1b5ec54e8675b1f3c32725e336556b6d23748e8da9668989cbdb5ad9d0e0ad1253f442de92891
 DIST genpatches-5.15-24.extras.tar.xz 3876 BLAKE2B 
daa2d5da1a55e035909da862f247e79e67ca6d514aec1b7aa4862f3f88508a0a6b1efa5dc21c70b8f79ca29cd88d7b7012ea380dd0a56931b82065ba4358c81c
 SHA512 
9cee406769c914080f8e68c42441c8235767f9247d9b5222dee661df6570923872022076d174f9d5dad2bf2b4f2871d266bc907e35c0b7f423a9322d9fa096d7
+DIST genpatches-5.15-25.base.tar.xz 1018612 BLAKE2B 
493b8c695f2bfcdfa36712143ffad423883273b48e0ae45db226d9e12b809764538716fa8dc257d0cb211f9db50f6af437cc8d19dde0e8af5a10accf85a3b4be
 SHA512 
f268ace309d283079e0f491a3a77de56d4a18fa31bba643be4d215f931baf6a251d1e28c358d4b606b0ea15fc34e71f6b13901f5eb95f18ebad79f384bb6e5a9
+DIST genpatches-5.15-25.extras.tar.xz 3876 BLAKE2B 
17a20913e907e6b6a87afdd7775b7f9811bc3eed5374b957244242fdbc655519606063656bb8e5f51ded3168f73e99832d0cdf66e830811dc1e5ea0c0b8a2582
 SHA512 
1b8f4424996351a70c26f5a90c2490078c1a8daa80da578e2e3b3d1c4be6a4474d40cbd2e6fae8b1f1b9389cdaf2257e01a14ac6c2f7ece8a883d745555a686e
 DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B 
d590a7041f6309674e8000c735a232bb2f70d872863e4122fa5a8cc8bc0e68b641685b4bfb10c81d286124084eba2f6815e9d650978b52fa2fff70508ee361bd
 SHA512 
cb591c67a3253b35d2d8dcbd229231507d28cbf2c1dbc2f734ba7e0fbfbeba6ca400f99bee6c9b94c90fad5facc9ee46c85fa4178087865d2e942a0717878a60
 DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 
79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4
 SHA512 
34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d
 DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B 
19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99
 SHA512 
80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild
new file mode 100644
index 000000000000..284cfd3f4e12
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=5.15.5
+
+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/v${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-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/pahole )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               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-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-gentoo-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to