commit:     3655c741ddce7737d57ea68b764fec4b2fc1282c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 16:19:19 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  2 19:53:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3655c741

sys-kernel/gentoo-kernel: Bump to 5.15.158

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.158.ebuild    | 141 +++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index a1ae8d0f013d..b62860e398bd 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-166.base.tar.xz 6725224 BLAKE2B 
f19d204334748c6c5befdecb51c
 DIST genpatches-5.15-166.extras.tar.xz 3940 BLAKE2B 
6db1809d2ff7d407c12a461c737a80ddfd0a91aa762ad2624613640202f9a65bc39b538007826740f42f8aa210b13f2936124737c5d5793a94a9778456135445
 SHA512 
45d025bbede7990ac1a8f285a6c27d4df79aab77842ec2f63b7e2e44b53b27f00da5e3866ced56fde852453130dc0930e8a1b2e95873af4c2d7a663649d1f800
 DIST genpatches-5.15-167.base.tar.xz 6743824 BLAKE2B 
4982628750d9373adf5b97fbd9d1042772cfdb2724b101ea7dc36b39587e78ec40cb1fc0c2fffa7e8e5e9d6361f0efa1445288fcf50f4d393a794c3566cb4ea4
 SHA512 
3ca376b96d52855d1c4708011defa2822fb94048ee7354da68db03df4f92497580b141d1b74982c8d6cf8370fbccbaf0883d417c18c5c0d3762c8d6fbfe977cb
 DIST genpatches-5.15-167.extras.tar.xz 3936 BLAKE2B 
48ef973309b1831ddb3775e95707a5550d18634cd3b567a5616e00f03613c9ec7ccb842fba4a4fe13b88190e7f7ad061ad524fcfadba4a196e8ebc0e5c40f245
 SHA512 
4ecf70a33fb2e3d825d952b7ac32ec1b0cb38f15f4f77d2bf955749bb97cb438db76974c40372ee894195e11954f9097ac6ecf17832f5188f47f69e6b917bfd5
+DIST genpatches-5.15-168.base.tar.xz 6757748 BLAKE2B 
32b6ebb14ed20864b51fef7cf5e81bee96e4b634829d10b0f29172c41129caf856442cb7c116a4982c6ec92324661daca1a0644febac00d2d39ddd43fe1902b9
 SHA512 
62b37104e6ac0c9eb09de4fd1657e945be70e90d4682537e762f63ca8ef34da713619d518bf6a0fb35aac4b1541a44d91ee18d806211c7e4cc4124449de49bfc
+DIST genpatches-5.15-168.extras.tar.xz 3972 BLAKE2B 
6cde986105f72e9282c78f59c8bb82bd3ac7c5c03adb3b3c1c657204624df2a28048ac0fe095759d5906bcd6677831d9962894b76390c2861482440120e72fe5
 SHA512 
6e067603b8e0e318703a59347d38d7aeb44a3097c39df07881c0f5250207b05442053a8ddf32069ead729ab4c36ccc1177ee8d82417ae2dbe16014b221d0d1ad
 DIST genpatches-6.1-96.base.tar.xz 5079348 BLAKE2B 
97ea3473a5189a92ea4478ff82051fb6b9b48344284168902c98674f4d093e2d9e8deaafc5e6ffdfe4653c7aa41bacb5c094f867dba3e283bf2fbb236d753d80
 SHA512 
3e7f9a56a0767b7532c89460c156d663e2bed069223c27f7b6d5ca7084c3ee869b00bd63a844989c4801e29e442ddf7889c4a025af97195228e181564d8f087e
 DIST genpatches-6.1-96.extras.tar.xz 3812 BLAKE2B 
506642a22002bf8bd3607d2bf060740e29d1a6bb649b0345f751c83e504f1084bf0bf279e69c7f52fae517acd7b166c32861f5263d843a02384d12b7f6e04e9c
 SHA512 
1c5a7f9e3f28d2db1d0136a037d32c30cfe754186491970addb9f3b8d24bad851e9472c028e6eb8dcc71bf892a227d7a7e606fa7b7210cf11f79b6d8a063617a
 DIST genpatches-6.1-97.base.tar.xz 5144036 BLAKE2B 
fd20d0a6c4b3f2bb68a97bc71e4853d0a1d2d93433904480fd89787c11976be51dc3510fa130cbcabfc47fa68be9aa66a5ddaceeff522f4b96c95d35e5c31802
 SHA512 
db1cba6f4b2db0bd24430622ffd4eb883416f559e22f8f7116ce1d26a78dcb811c02efb896e0cf470c4a7839a3af7a564041f0b4ee56d1febbc52da62656895f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.158.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.158.ebuild
new file mode 100644
index 000000000000..962a350fea30
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.158.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g13
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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-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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       sparc? ( 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
+                       ;;
+               sparc)
+                       return
+                       ;;
+               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