commit:     98d438a0e34ccd3f51519c79f2baa179434ec4dc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 13:37:33 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 17:08:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d438a0

sys-kernel/gentoo-kernel: Bump to 6.1.123

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.123.ebuild     | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 36055540bbf5..2dc744ae4e2e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B 
0ff847805abdeefee31ce75d0b5c
 DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B 
add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae
 SHA512 
7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
 DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 
3a1d86ff100ded252a1af8cb1cbe50ea55e0789041f0e740c30c6a70c3192d8c90f873c46f9989b4b76071d1364f29b2eb8230e2675d22f2e14b6cb94e3e16b6
 SHA512 
bd225633a720a3d271969818c01b59792b5783c16743cc020e3cf444a37116ba57b0d82280853b432a3e3043a29f717ad2878dfcce4516a8127c535367ce6c49
 DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 
3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f
 SHA512 
ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
+DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 
0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f
 SHA512 
10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf
+DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B 
e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc
 SHA512 
e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d
 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 
1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633
 SHA512 
f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147
 DIST genpatches-6.12-10.experimental.tar.xz 78160 BLAKE2B 
d145325c0a3bbdc93b1e7ed86f860576192aa7260cea083508efc581257cfeced92f390c398299adb1c989a513c15a5252e79e9e05737eabb89a98cbda9f5d91
 SHA512 
5b3b355fbf2109d83104f92486df4ad3881f1a78b3dada8285e195486def7d1668c55c797460504647e43d5a8f4fbaac7523e9c4745387c314fd1a8410083c5c
 DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 
9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54
 SHA512 
cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.123.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.123.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.123.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2025 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 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g15
+
+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://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}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug 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 | 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
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to