commit: 47f85c457ecbf39b7b66b62fa31b214359a1b544
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 14:19:43 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 19:00:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f85c45
sys-kernel/gentoo-kernel: Bump to 6.1.131
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.131.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 4f18b3dd81b9..b0e8d7b2a45f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.1-139.base.tar.xz 6935336 BLAKE2B
30d7dd358ce4588cb948cff480a3
DIST genpatches-6.1-139.extras.tar.xz 4056 BLAKE2B
aa22b3363e11a53ee35d0d4ec3e95b3bac0326a6931bf0a260219da44b50f7ea8da69c4525d0c96e24fed013a8fb9f8fbf0471ef446afb55ffff13b4c7f7cb26
SHA512
473d93d7065dfe9223493df37a04b1d1a6be9707e05501868341e6058604b96fa697198978214ce8e8f70e5ad4f54dda4e9241639c48001540901120ffb3d7ac
DIST genpatches-6.1-140.base.tar.xz 6984020 BLAKE2B
e5fae42210839e3d77570781c61a0dfcab059a3e89c9f750c905756a435032598676f08ef04df2287911a3857b903a0d453009b395222a70d92b8d9f6a7efb1f
SHA512
d60623d0112952865bc80e6245b269dc9630623d322e710929a39bf8fe3d5f021d1442be8d96401d7eb1ca3ed92a267ac89a6a3418f48c494a338375dc58bbee
DIST genpatches-6.1-140.extras.tar.xz 4056 BLAKE2B
c15697f8253e9003ec131de40ac29eab37a8e038166eafd7a9ea8ed7f8906edd5e974ca25876b8958ef4d22e9d89c4b4e4cd15686c5578386faad30058aa5865
SHA512
2a31d11083b2e2657d66ae5076296fd66e8566768a57e251fe0ac10439d2da691fa06000a802341f721f902b41b56b5adf6fa926661758ea45a9df8f8ecc242b
+DIST genpatches-6.1-141.base.tar.xz 7008292 BLAKE2B
431701f438c86e443975beb91ad78d0d858457416f186f44c8177997cff7afbb2fe95b59149708bb2de995e5130d00f824bef65c8736c2e7f72a59949ffbcc27
SHA512
cc4102f9dd6e2e3c357095d7e48dcf7a2a7a2849bd1cd7c4120f5475f07e1f579916f2d312da2db99a4d2a6813fff776d5882565db195cd214414a22442540a3
+DIST genpatches-6.1-141.extras.tar.xz 4060 BLAKE2B
174f955f760c8e455426aeeed2f191b64685097192cc1e360fa59a21864c50fc6ab2bffa5384b98da443b1df99f460beda570b2e808d5c28d514b5724833e4b1
SHA512
b0b489cccd9cc081e7e723c230629989a0e2bd725aad506cd76617932a0adf541fdfaee83b7ac7bbf35572473c124a6c7ba0f7fcc6b82129a6dffab68258c12d
DIST genpatches-6.12-20.base.tar.xz 1202448 BLAKE2B
29d739ca47c15374e039c5ca76017dca7ff4da352bd161127c0fa1d2d9faae002a99d284b3dcc94cc6357e3df9f43d4637fe172948709a2a6829df836edae0d3
SHA512
47e5e47d11ce176d3cb22e51641b2987d8b3aff62fc12546f3336c939108da5fbd66f1d2dee0b0d932b896666e504b8449bc988c34bca8620e3b185322db0106
DIST genpatches-6.12-20.experimental.tar.xz 78504 BLAKE2B
25778b844669455b4e86da77ea029ce6ce788b8a26d5a6b4674e9164045eeadba997ded46611457fe14e0d8db56927dffc76fb9ead9ee268bda76ed59d7b7a70
SHA512
e0f94b7fbba58372e66114b8c4c0d7ccb37d325dc0657dc808ecc04961d4809eff6a3af149fe5ac27d9979041954aab674bab3312ea5ad6e832df7051606e80a
DIST genpatches-6.12-20.extras.tar.xz 4056 BLAKE2B
d4c33c87e387de3b7bda99a9b58c8b8284129e945ceebe7b3972038bfcf9ccd0b67c0136f82ca1178ea60e12861e3bec4b26bf7b3c91c36fe9ecb0520930f1c9
SHA512
af5c01cb6e4154c20cc5d3cc84c90aab8e43b616e04da2c08b0e4e86b62c9a840a02dea467bc7eba39f699457c37a8038c5e81991bc3234dbfa5cba37bdab4e2
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.131.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.131.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.131.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[@]}"
+}
