commit:     fc10e58ff416cd20cc08e0789e3e7f1d29641392
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 14:33:37 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 18:50:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc10e58f

sys-kernel/gentoo-kernel: Bump to 6.11.4

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

 sys-kernel/gentoo-kernel/Manifest                  |   3 +
 .../gentoo-kernel/gentoo-kernel-6.11.4.ebuild      | 144 +++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 710583cdee3c..528a0942cb49 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -32,6 +32,9 @@ DIST genpatches-6.11-3.extras.tar.xz 4056 BLAKE2B 
84e6bfed32549a2ee5752164a91cb4
 DIST genpatches-6.11-4.base.tar.xz 429820 BLAKE2B 
402166e1e2be81943dd191390608e1fed640c402c645b8a50784e9744aec0c5232ec3aa7b0a8c14a30936a98d415b768796ff8182ca23939c4469eb60165f81b
 SHA512 
1654b813036688a97b514705fc43955930f080a2d0068a967d67d80587257270851f754ed4b7d98098e8ff0aadf1bea9ae025026b4a4848210b44d58b5041ed4
 DIST genpatches-6.11-4.experimental.tar.xz 5772 BLAKE2B 
961c02ef554e069a7b929c239c420ae325c4ec94a841d3acf57f6784dc41ef48ac5f14e96aefd096af205309fcaeeb41c2758d28a73ecb6536f1a80d9c668cca
 SHA512 
06b6cc560e7ebb5f1d0a866e5166c1b6d6430e45b6326b4206dcef4751b9238131b4b3940d3ac342902bc69c13fa8bed490e64ba44bd03f8eefdeb40a14f8fbf
 DIST genpatches-6.11-4.extras.tar.xz 4060 BLAKE2B 
90d2186c2aaf39cea7c5152196fdc6401350a2ec69e84ee0975449f296b9625260bd69c4660ac1e2dba5e912d2f6f1fe15e05dd639a5ac615aff65ca58ea1d5f
 SHA512 
6fd9adca80bf0600a7c3701eedefed15b4429211ecd925bc9f8f7a07c8997f5e1fdc178c44c53a9c97ba4c568449a9b015b01a1eea1330d21160b114767d4fc8
+DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B 
c9e98632ebd2e74f59dfee66d13f9e4cb515d87fd5f6db946aa577e6fab49251b6d374cb1cafb66b2139a8b75c683ed58557745c8f17e18b14f7bbb417579fcb
 SHA512 
a53eab3075e55c7a7ab82f99fa853f08b054ed0fc95d9008b17b5571e370ffaa53b87662bacec8a4f5309309e89df1282f6b5747df595c8617fdde74c1222cfb
+DIST genpatches-6.11-5.experimental.tar.xz 5764 BLAKE2B 
10018afb311844639407ed352c0c070944cd951948ceb9bdc9a6243e2f8caf302bc8932889541c0303e09884766b6ae96f59c13d653b5bac79bfbc9ab0a8d97b
 SHA512 
c260bc5480b9c3df5958ca859caba618eb9c223fcc165d7de5f11cddb5f06f83b71c7e305b3d84df1061a2750a07d23d75228f287974f4bc8999c898f3284d1c
+DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B 
a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c
 SHA512 
3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288
 DIST genpatches-6.6-58.base.tar.xz 3154204 BLAKE2B 
5b9456e93cb0984599e065fab0d05e40b7efbc8079763ede75ed7a6e7f0e241de96f0c6438cde52f64a5074f5bfcc5d55b5d3c21a9e9528138ea5c36e164ea58
 SHA512 
e775ac64564c201c3e1293d34a70f347a5afd5691a006d958f69959d2eea0af690cf66f7bdd450034ef9eb43daeccbedd58819dc688cd3e7e9933da9312cbf75
 DIST genpatches-6.6-58.experimental.tar.xz 5760 BLAKE2B 
b4af0dd521cb76b237f16a505c55326359be8d45e92f73d98c3665c95ee3db563a5b1732635158612afa0212340ef2b34cc5acdd2fdefe49e8a995947124d7eb
 SHA512 
1a4a76c9c5d1253072f7a591b5a98a4b914289348aa1162d2ec18075ebdf9f331f5c0a7a9043e6772fb6531b84846ef6b66cd28ede67859444e2a895becd18e9
 DIST genpatches-6.6-58.extras.tar.xz 4060 BLAKE2B 
7e16c5d713aaf221335b81f3a301e9bb1e7f243d9bc6739c3dd07bb3cfedbe6bd5a763ce418172c838fbd3de82909cabff7c2e5c4b4f1b675098b709ddc5203e
 SHA512 
315bfdf633398b3b1a9650dae88fdd0c1442336cabe45a3f2722e968f510da13050657e8d35acf8a313981bd9403f5056abea182a0115a79952a2740ceb4ff88

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.4.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.4.ebuild
new file mode 100644
index 000000000000..b8724c4f5ec6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.10.1-gentoo
+GENTOO_CONFIG_VER=g14
+
+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
+       experimental? (
+               
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( 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
+               arm | hppa | loong | riscv | sparc)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               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
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to