commit: 0303af21da0c7ddd4416623a29912ed4f13523b2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 13:54:48 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 22 18:50:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0303af21
sys-kernel/gentoo-kernel: Bump to 6.1.140
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.140.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 9ed30a8092c8..4f91c048b587 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-148.base.tar.xz 7251144 BLAKE2B
cfd4ca7977b58341605a362f2bc3
DIST genpatches-6.1-148.extras.tar.xz 4056 BLAKE2B
24ed5ab9c6306795b75a6d0046fe769a3e1bb799f13306c101802bf13ee7cd0cbefc908a67c4effc5d49c769cd23fcac3bbb653c2e01c790cc074c96cab3c05f
SHA512
ddd28d283e0e16c6feabc92e713ae3e16722aaa7d41de1e5d30392b9b893de1a77bb3b23d1afe7884afceba40d3fcf85bb936924af04d4b6757b8b9dd724661c
DIST genpatches-6.1-149.base.tar.xz 7281644 BLAKE2B
4f48b53a64fc770f89a9c34a1b4b4e93e521d16fa98e0ce27efdac173acff42649f93a83b0058c42ff43b282d616a45189659f202e77d0df1a634dee2016bd50
SHA512
aa108ec6e71f387333394d35d06c13e88858404fdf7ee24c45836aaa9adc56624b016c1b6cab39319d3fb0401e19f75fde28cce88015d38da24da9998f235f89
DIST genpatches-6.1-149.extras.tar.xz 4056 BLAKE2B
616bac1c9c5c71d45cc715bfb590aefde34f460d5337cf0de7fc3af2e44969f85b09b06f4d74526c9900af222748bbb51b5ba89538bae7de007016e57c141a38
SHA512
8abdc1f531de850e951a4ff52e0a1c33bd608f307b0e9398d3bbb78d0e2af470d59e356eea8d6c98e148427b1cd2833296f256aa9a6a91a420f1a6495772d10e
+DIST genpatches-6.1-150.base.tar.xz 7305232 BLAKE2B
ab1cc6541bda8af60a3aa5a9cf58a47ec3d0f5ab84d79cd557f4fd71b0c43984068300d5df18ed3f7e2b3548c3b3e7712f6c6c6c767f23de9103d7138e9e500b
SHA512
9ef78029cda981e733b6340079bf37ebabc86d97e5d7974b0bc5b39ca90744beebb06aafc6a9b35ede5bd75657d3161307dd4d85b9f80907854488b3750b2699
+DIST genpatches-6.1-150.extras.tar.xz 4052 BLAKE2B
e268be13305885933ddf6b51953488c134f5709b824ab06921577788a7c77f687e87699b0d75148af3384be8d5cc00dd0c0633fe8edfa2096eb733f668656cea
SHA512
6a656b40cd59fd788f0faa9b93ec33b8a48b11014f83b2a0ba52288ad88101cb7a40cb3168fc6a502da93a2c79972c640ad37a12b4ef2485fa7001a963e491a6
DIST genpatches-6.12-33.base.tar.xz 1940132 BLAKE2B
744c375cc762a071fbf956b5dc84e7126e35f82b04b3698f0fa52ce6fa6c781ba9631d6ed5b8a5acb5f04471809639b0c4e99651ff84f209b3d5a88e4f4195df
SHA512
2dfe26826b474c36915b48504c2e5b911d7c731d0228b671d6cde1b8b7225aeeb7f0c4bea1793bfa43a69caf31c05c77d7c35c0ca90b9c73c6c4b2be44ea78a9
DIST genpatches-6.12-33.experimental.tar.xz 6060 BLAKE2B
30d79d0f840f867c5fe465f69821c2e499867406704e9e4d1c6c88089afc3bb66395ba257968c7794d912cae87d89b84ad9ba20b7404b425950ae390cfd73ce9
SHA512
38fa6fce9ca36c041749539f53d40b78d271df0a1320365dc20e3c1becab2e4a2946d53c87f1a89a19c8b277db9db21ee4020c8e68a31fa8ea876915c396218e
DIST genpatches-6.12-33.extras.tar.xz 4060 BLAKE2B
9a5356f45097a5af36e7f44e29d75e83b3b14cda16c86854bb4e1a6d2b974a86aa474916228e2a642aa9e58f05a58550d56d63c14bbd1de17c4a2c9c70a03b69
SHA512
36dc5f9501484d4fd3f03d30474b1b6df44a4b8b01f3cd0b7c449cf2c7b282d61c0d447d24ee49aa112a6048e239ec8576e622df389766deeea55d4fac724f33
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.140.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.140.ebuild
new file mode 100644
index 000000000000..6ef9cc2daa5d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.140.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[@]}"
+}
