commit: 571f872e7c2b8d19a63aeb34ae83de92b6d4c2ad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 15 12:49:54 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 17:06:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571f872e
sys-kernel/gentoo-kernel: Bump to 6.1.156
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.156.ebuild | 174 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 381f68a2552f..d849dec85680 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -58,6 +58,7 @@ DIST linux-gentoo-patches-5.15.190.tar.xz 10240 BLAKE2B
41c7a6f78b3ab7b442cb067d
DIST linux-gentoo-patches-6.1.147.tar.xz 29060 BLAKE2B
ba49c42dad2186d320b37a2ed456ff0388de619bee4bda26336939567b2575be1cdf7adf853e28b7b5b1636a9638238337ff0e4f8001504c4e90287af017b367
SHA512
1e376dc5ba8f6d76fdeeb611802248b045059a4a2a7e174c31a73216d78f462366d88439d9cec2a60f493ba6258d5824d752f0f95b263349a0d12b3f196cbe32
DIST linux-gentoo-patches-6.1.151.tar.xz 29532 BLAKE2B
fb668de25f6bb9086d4fa1c76768c5790b44dfde9dca155a87b06486359cc8e7f56b6f9f032cf48739a14b47cf45d128c51be704ad4a3c0fe602d0c32c8adad1
SHA512
8df05c50f5c634172f517ba2df7856752b433f3316649b1955f1dd2784adae29558c1e368421f15ab91899228e1f77891f215d65e71e8966fd5d982de33da6b6
DIST linux-gentoo-patches-6.1.153.tar.xz 29056 BLAKE2B
4a00d70119f3444d4e3fdbffbd82da7ee00c74522624c3cabe161cc30bf2bb8b2df02bedc1e09599ca3dfed972647a833705e2373b1f4eb8cd479b622c3d10a3
SHA512
9fb87b498e2aeda131b3ac367802c41e273dd69676f1ec96de4462abb4a6822bd1768bc68cb75fa08b389211a7edd59cdfc8ad34ad0f74b2d0c5d39748a2ac7a
+DIST linux-gentoo-patches-6.1.156.tar.xz 31604 BLAKE2B
09ede2987691e372c41567d975070451d243662b9f86dcd35489b63b732583e34431e1ad93ade3f9ea77dddae06e71e5752c0d12b3b6d0765106e19fe30876a4
SHA512
2f4a7960956c3aa7bbb46b20d14051ad58f07f45f8c4a6115100aaf6a46ddeaf414e1247d6034e4f71bdd7fd9479cb1b1bffab5e480a0422ad9af3b23e2bf95c
DIST linux-gentoo-patches-6.12.40.tar.xz 19240 BLAKE2B
2e5bdafcbe44cab520c86d7ab37c48c5b032693cee5674d1625432e4ac6285137a3df2aec24abe4cf795247f76226ff236f09f7e748ba3bd7db81cc76af03526
SHA512
dfb551b87530b0509293e87cd70d2d91f1c669c62adc6c7f34395ffdd5fbfc19bbfe943f84c188653a71bd627bea95f5f9391f4edbf0e269a8da98e191477fe2
DIST linux-gentoo-patches-6.12.46.tar.xz 19724 BLAKE2B
edf0bc009a30dcf5d22c517bdfbab4ab7e4df3510e2102071fd24788d5cfc610434da2e92092ca5424e12e1676149b510f2de7e937be1ed96d0db4e2260ad42f
SHA512
dd9d7c48767f3db0a8a6a33e8ffa9ecad4345044586d76de65d42e8985ef794bf7ab547852a1653bc1d66dbf4accdfc06cd5e35265cd2d2cccb0aafde21d8950
DIST linux-gentoo-patches-6.12.48.tar.xz 19224 BLAKE2B
9265bc0cc7be0ac7bc51677f750bfa642dbc7530979ad5a743f6e29ca4514b79dc0a906fcc324482a26f53111d7a7f660071857aab875b25ca3e1dd9086a6407
SHA512
63c4b64e5ca1857ab71e92633ca32941f9e4c2ca37f53897d5f257effb9452721be5606770cafaae6ce238cc9cf3a5054c56a519111713c0d462b79549aea669
@@ -84,6 +85,7 @@ DIST patch-6.1.152.xz 6486524 BLAKE2B
f9b532c867b2b5a15d28c08f89f9a30252b4b9d55d
DIST patch-6.1.153.xz 6497932 BLAKE2B
67a540a290ccb6db0b4f83916102323a53907adb1d56874c11a11c91fa402d0a80f2151d9d1bb6c1dfb59522e239be788c0e4d5718b8039cf2016c7debd26a4a
SHA512
d988204e844c17c18fa6d39d5712afc5a326374e82eb049be7c80d625be16400ea57accd81f7c550c69f8f803d01f48ecd4b497145a825817dca1b450f7bb5e5
DIST patch-6.1.154.xz 6507340 BLAKE2B
5333097c2375c59b2bd73acf4b02cf60bf8aedb085031075dfb6c1df88995330e62163fda59e98e756b1456ebc3995b699102932b50e5e15ba59a1f92eb6c877
SHA512
268c89cef61d4fa0c83eed99f7056ca5483f855b6e78004c384c963cff3a21b68313683ced3b211d4b3eacc9481d3ca7e71dd8aa98912444ea1e10b5ed40cd33
DIST patch-6.1.155.xz 6523120 BLAKE2B
d7fded35eb0b20ced762bbaf0caadc53bae23243f3fe3a2ce25a3461c5cfce131541826aacc8764803edb6eb6abbf8253a324659f65186ce683909382ddd43b3
SHA512
4ec98b90483f80fce40dcfb134b7ebeb4b3fc9d257b0a2a6ef6b23f77e786e8a13c7812fdcd8928b40ebfab28b247a1e8d917b5429bbac538a2af441c4f53b77
+DIST patch-6.1.156.xz 6549524 BLAKE2B
3dd6e04f40fe58351f4a832550ff3058d840fa0e71768f72cf9b0930772a67f5bf60b0719460ec0a9e33185c13240f26946979bdf9d1982e48e69f35e7642b0e
SHA512
abbea02001a8caf931baadb38fc30346fe69786fa26d6494689fb4fb77fe83a5716714363d0f7d5d47f3c13c43fd09ecee3862a6c5b926064ca64aee7b3d8184
DIST patch-6.12.41.xz 2584360 BLAKE2B
8cb7d77a45e79b186e24bc59be15d74f4e9ea4b7c7f7b5c81b82eaa9b1a8b88a7aabff6768471d905e24539366bdb85593304365726307e19bcfa41937764bf0
SHA512
b9307fafe443eb61b0edc624b2c9ab7a0206765eb614683e0f01d7f7fab04a729a91d92d67b8ace03208d6b63088ff235203e8fdfad27adc97cdbf7df872b3c2
DIST patch-6.12.47.xz 2896968 BLAKE2B
4064af2ae029d13d63a0a6cfb9e4121266ab33622c03e088ad3544a0f5bf443d75a2ff2f7c35b58d7cc8669acb0eac93165cd3bfe5d8567f332516850bc9f7a4
SHA512
19bb9e9e235fa408e3b37dd6fe475f1dc7690bd09274dcdcb722ccc9733da9169dbaa97dffb15e0b32da6a62cd89b2da8cad32b4d2f16f2fbbd9d023b5ebae9b
DIST patch-6.12.48.xz 2931416 BLAKE2B
888711e5a4b9578bdd09379aac0b385b901e9784e1307b2c36a700f996e6deb9c2e6531ea2a4fd4daec6bd2cb44c8a7767d00e59922c2311e448592605929e00
SHA512
f7a4999b1f2d2019fcaf691a2c0f1797be73858404fd4825962ec32945733fe98f625d8451d9bc264a1c14500b4596be6b73ea947da35e7b27f044f08642f2ab
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.156.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.156.ebuild
new file mode 100644
index 000000000000..c88d751502f3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.156.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.1.156
+# 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=g17
+SHA256SUM_DATE=20251015
+
+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/${BASE_P}.tar.xz
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/patch-${PATCH_PV}.xz
+ https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.tar.xz
+
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/sha256sums.asc
+ -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+ )
+ 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}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental hardened"
+REQUIRED_USE="
+ arm? ( savedconfig )
+ hppa? ( savedconfig )
+ riscv? ( savedconfig )
+ sparc? ( savedconfig )
+"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+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
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc"
\
+ sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+ cd "${WORKDIR}" || die
+ fi
+
+ default
+}
+
+src_prepare() {
+ local patch
+ eapply "${WORKDIR}/patch-${PATCH_PV}"
+ for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do
+ eapply "${patch}"
+ # non-experimental patches always finish with Gentoo Kconfig
+ # when ! use experimental, stop applying after it
+ if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]]
&&
+ ! use experimental
+ then
+ break
+ fi
+ done
+
+ default
+
+ # add Gentoo patchset version
+ local extraversion=${PV#${PATCH_PV}}
+ sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile ||
die
+
+ local biendian=false
+
+ # prepare the default config
+ case ${ARCH} in
+ arm | hppa | loong | 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}/${BASE_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
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
