commit: c8559d98a8b47eb7de361cc770d5cb3ab4892327
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 9 12:46:56 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 9 17:39:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8559d98
sys-kernel/gentoo-kernel: Bump to 6.1.138
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.138.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 1aa2c0c4d42f..218144ed8a7a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-146.base.tar.xz 7216868 BLAKE2B
edfff9d3be6142527453263c896f
DIST genpatches-6.1-146.extras.tar.xz 4056 BLAKE2B
fd78397729f327b395213e9e6b2bf8160416285d52237da424aac4fcd78160974d148cb15a66b37b8961b7734dbf57c4b426098f409c6606f763ba439d04ec72
SHA512
54c601af719bc21f4230c93e83e51018745c20ae8319e5234c22cf9dfc6100d30c81ba464a154aebda2c977be40246621c2d4f0ba4f4d20a55789a73401d6231
DIST genpatches-6.1-147.base.tar.xz 7218192 BLAKE2B
95633db66825afd9f7dcc952be3fe4a5d52e968a15c68bdcdb11b97b99506671776befa6d2d0eefe9c3ff6c8b255c60482f5c3ae17aea3d065c3bb4fe5635945
SHA512
2c1e3232e62bf721be90193353056429b7dc5ceabdef28e56ed66203248bf96ce66deaebe9fa01c39c006839beb5e22bfae75ab736dec68bacae735d02f3e696
DIST genpatches-6.1-147.extras.tar.xz 4056 BLAKE2B
9465faf06021d2272b518d1d4bc72da1e91f285e28990dbf43353187c6e678c8effdb99ca30d7de70df3d495a276377a906b6786905d10ae6d4f3d8823e6afaa
SHA512
e387628c65e0f652bb34ed69c5c1326ce01cd127e50d04940f63afde6b4e7c83aff0136b42aed32f08b784073e17b8c5795ee295c936af4f859e2cecb99e89a9
+DIST genpatches-6.1-148.base.tar.xz 7251144 BLAKE2B
cfd4ca7977b58341605a362f2bc38e389005bf9ef42bc78ed3e7aea25d6988a0f260a749ae9ca74de843d845605c1346933efc0d0572c139570457828a3994e1
SHA512
4679f697fd05aa28cc77b7ebae89f5ab2ebef6abc4cc9a7a49757728625736ab38ff16ddc37f31e505fa3fe09acd24a84ad0c6031af5641d7c47d8f79e158d97
+DIST genpatches-6.1-148.extras.tar.xz 4056 BLAKE2B
24ed5ab9c6306795b75a6d0046fe769a3e1bb799f13306c101802bf13ee7cd0cbefc908a67c4effc5d49c769cd23fcac3bbb653c2e01c790cc074c96cab3c05f
SHA512
ddd28d283e0e16c6feabc92e713ae3e16722aaa7d41de1e5d30392b9b893de1a77bb3b23d1afe7884afceba40d3fcf85bb936924af04d4b6757b8b9dd724661c
DIST genpatches-6.12-29.base.tar.xz 1803156 BLAKE2B
5db87d06800e230ab09e6f085126163fb4c3ad98b4261c988563436c9e5ab9c3783152c135ddec11012c3e6f1f9922782e9355416424af47074af5b352e3463e
SHA512
4a98527730e096a1eea0d16faf88604d0db359b1ded00cab1417e4b6e2ba4f2fd9ef1a1739480895720ef63d80b753dd8752cc81592949d24e3dc678e4b6ea95
DIST genpatches-6.12-29.experimental.tar.xz 6048 BLAKE2B
e4e22d8a316f80cc11cf8e1fc5115da5d475a25ebed6e0241a30eefbddb9186e9e498a5a719a839dc90a9032139ddeb7ea966515aaa39e7f248e801926b207a6
SHA512
a878aa0106e5f8f957496ce9b7de72de8d3d32f3245eeba802051b91a5675bb4e70dabe90a8175d818ba2f89f55520130d4cf7c8a6093e95ebfafae81d8ede60
DIST genpatches-6.12-29.extras.tar.xz 4052 BLAKE2B
f65d1d41d35679a525c1b92f26194c48dc757abb18b37793b69d5b5a49f312be091682f19ade2215319f4f45e46517e2e1fd54090df5c405f962d8cb228aa689
SHA512
7f81c3da7d277c141b00a0e39840dbfaa6348ce45d87cf35ec94997958fa2cc0b8341352b90cb7accd2b3b216e85b8d756f7c13471686afca6acc7d12a5164e2
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.138.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.138.ebuild
new file mode 100644
index 000000000000..6ef9cc2daa5d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.138.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=g16
+
+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[@]}"
+}
