commit:     64810e1f292805d95b682a96639984cb14704766
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 03:35:10 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 13:28:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64810e1f

sys-kernel/gentoo-kernel: Bump to 6.1.128

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 6dcda2134309..c4845731bae1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.15-187.base.tar.xz 7870496 BLAKE2B 
3ed1eafcf3a1e7b86ab86c92ceb
 DIST genpatches-5.15-187.extras.tar.xz 4056 BLAKE2B 
03232a96502d2d77574570e07649d37d2007ecf4de1fbaf58ddf7f202cb4367bb692ad96b489b0dcc07419ed3c40997838673a3474bf71333e7a92394369776e
 SHA512 
464b1e647649a6abbe45b34c3448d240c41de89f3276b4f981a7b5922190253e2b60bb1f6e5073ab768afdf5cdabc83f46ce97b12fb3eac62562648954f05165
 DIST genpatches-6.1-137.base.tar.xz 6788380 BLAKE2B 
365778dab67485d413506657e7dc1e0b735448452fe2168df6a39f7f7e998f50d8538e0cb0f9d48cafc11a6e39923bd584a68b330a7255d77277d08135f591f1
 SHA512 
01522cf179ab48bcde294fd2d6e27bdad0681b0e63ddaad03aafb1b7555fda3a5728d3bcc9a2cadfd262e8ec2535df7ca1f538ad02f916cd4a1913e621770f67
 DIST genpatches-6.1-137.extras.tar.xz 4056 BLAKE2B 
8a39c1f0b11bc776f301f6a750af6d7416a20231c7170f50080a61b40071a55f6d2906193d76d8fe4837b4b494fcf0a683a7325ebf18eaed6543c0362c78a6ea
 SHA512 
9739342cd761efc0fb4b2d09f147d721b8099ec0594a0190a0f39fbb23b131068c6127be3b0083a1e60c4d4120b3437bab8b4608fe1805724e513890a0a46bed
+DIST genpatches-6.1-138.base.tar.xz 6804336 BLAKE2B 
31d8912c815d4560b35bdaa4fc46597d641c63b693123ee34678c6f9e89a808e3d0ff90c762d601d2caaebd6194083cbf55ea34bf8df68157fb51cf9d603b766
 SHA512 
f72c533a8afdd81a17fdc27d3b5d7323447c81d70a1295ca1aa949cb1c5a469a1dd84fdf97f81cb2ab762fe6ae09716f3430da13378e4dc08d4511c6dfa81116
+DIST genpatches-6.1-138.extras.tar.xz 4056 BLAKE2B 
a9205e4748d7892920c7428cd80bc8b4e8a8b86467dc8771b427b941c882af4de55b2d3c6450410a26ddbc0dd2e4df9a912025389379b0f02a20e7b0f2c99020
 SHA512 
50c042432612985dbdd7802004471f58bb7a5308b362df0ef903262214c116342817abdba2cef6b1f4f3ed281c62b50c19d4d0c0b43eae148a0ae870ff812460
 DIST genpatches-6.12-14.base.tar.xz 846696 BLAKE2B 
63f6f0326eedcbc5d44f2320dc0c9352c009e219764d6eb9e1da460a6b10538e5c81c27a0a633264d3d1011af266b310e49a9b928dd59dc76b226cc3ce8b06de
 SHA512 
909307a85a15e27c517e352690c4e8579d4889e36cd7254164230e4589b3544ab1126008373ea2289628361cf82414da9de4809c45c1f1dc02ab3666547d0a90
 DIST genpatches-6.12-14.experimental.tar.xz 78456 BLAKE2B 
af1a353da652145b2980e9fc2b176253c36a8bd8affc4073985cb709667473682517172542bbce412b26e7dbaed2f71194ae6b27a430d5c140012b883499bb45
 SHA512 
de8a09f9c9f3e4e27476c0260ad182b78cba31a79d571be0d4de0cc648002dbf542c5abb82fec6c5fae9698aac448f6941cc80b110c9ce50979f86223705c17b
 DIST genpatches-6.12-14.extras.tar.xz 4056 BLAKE2B 
db12618351b80d499fbf9b3f8d0a4ab00639fe1b0c73776e0b038f6f996db29f0890d796effd120c3428a9515771016cd0a23da559c028996b312e75525d78aa
 SHA512 
79a23575135205c33eb07d7026ccd0c38e5223b4b29d7c90002b72074a089fc994c38dd17868e53198fc11d2fc28e229a79ea50d5449261aad9689cd73139003

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.128.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.128.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.128.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