commit: 6e4485a605f94d560bf004158bf97d6f8571ec9f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 19 05:13:25 2026 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 19 05:38:17 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4485a6
sys-kernel/gentoo-kernel: Revert "Bump to 6.1.161"
Broken on ppc64le.
Reverts: 315a58d98df96087c513b8e1d7d3d149fd21515f
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 -
.../gentoo-kernel/gentoo-kernel-6.1.161.ebuild | 172 ---------------------
2 files changed, 174 deletions(-)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index a4a11d092e5b..aaf2749ba87f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -37,14 +37,12 @@ DIST linux-6.x-sha256sums-20260118.asc 193071 BLAKE2B
7705ec74114923142587c59371
DIST linux-gentoo-patches-5.10.246.tar.xz 23580 BLAKE2B
1184fd10a1321cfde67d276426103c73993fbe93e81047b494d358c433daa10a3c141349d01daa7147a05eeaccaa0eb87256b4f523e66f2f7f7022385982776b
SHA512
31dd105101372b569c98bc72d6d8fd15fe95ece08ec9f48de10f91112f1526ccfbb349a67913ef1f8c798dd3dceeecc6312eeefc097d9ccd3b55edc70d3dcf10
DIST linux-gentoo-patches-5.15.195.tar.xz 12876 BLAKE2B
d675d4150c8292c4f4b9846a26c53099910905e04e3015cfb3cb60e53dea99028b2e6fcbc345255246103699910aecf916054a09598e931d110b31db59a0b517
SHA512
e86691215cdab56a1a4fbe9aa3de44bda93db5659c39b04bfce53ed6ad8ed6923853431abb9444471b227421619c40e8841dab582b8007216e3c22e2b348a549
DIST linux-gentoo-patches-6.1.156.tar.xz 31604 BLAKE2B
09ede2987691e372c41567d975070451d243662b9f86dcd35489b63b732583e34431e1ad93ade3f9ea77dddae06e71e5752c0d12b3b6d0765106e19fe30876a4
SHA512
2f4a7960956c3aa7bbb46b20d14051ad58f07f45f8c4a6115100aaf6a46ddeaf414e1247d6034e4f71bdd7fd9479cb1b1bffab5e480a0422ad9af3b23e2bf95c
-DIST linux-gentoo-patches-6.1.161.tar.xz 31052 BLAKE2B
3d246e3dac7fd0eecebbba21453651a1b3809fadc89332a1d99ed42c80fdfe08b490f6306d83a7e815a54480c1b0d0d930a5c3919552f7b76c9c0c683ffb243c
SHA512
a084f88d8f09d890967b73d455d57e156929c30a7d2b92dfa12fb0ab6a361cb0107b13560b905986e57a804cf54b68777bbddba137bbe12bb4785ccf3e418520
DIST linux-gentoo-patches-6.12.62.tar.xz 23544 BLAKE2B
f67dcd9b5d60b9e4236b9a8d781206ea7e500e8bd468ccbeee9317329fe3ca8955a75be63d0e2629715ad8353d975ce75789e3009dcea36dad381eb53ce57c97
SHA512
357eac8b1aa89cbcf746dd72cf222d80132b05b17b1de4ee3d15220b9a0038e51de12efbd90b5edd019a3fa996c05382a718fad674afc603512d209f315500d9
DIST linux-gentoo-patches-6.18.4.tar.xz 11664 BLAKE2B
f939e93580b13301ac66e3e6b924f48256109311f7cc3c5fe83c504bb0469150ea4db4744f39f3233d1c5f5850659c272e4b32cb2252322f404a9ab8a64279cb
SHA512
505f01b59a9d684d99a997c3ed26ec023100d524485724324123b920153ecaf63bcd26040b0ca05886ad3969828a5bf4dff60a0690e9791d6a2ce05ce03fb95a
DIST linux-gentoo-patches-6.6.111.tar.xz 45328 BLAKE2B
d940d418295c07fcf55614fe415b8124bb9e6abdd2cdb992f9b06ceb3f752503bf17df4224f781cef85170928a76013227340235d50b514899d3893d2f94efcf
SHA512
4555fad79908133b0fd0ac0ec03ef4f5b6345974e4243b35255e1ee24182f1091366bb39f8d0cf40f67dde04eb688e95e2902c048b8a3b7aebae64fcc7c2847e
DIST patch-5.10.247.xz 6997100 BLAKE2B
aead70810bfd903f1ea2be4e24a0eb7d3282032115ba1d61334193d33420e08abf87bd537243199b5d4e8d4d161f972fa487ae607eee7a5d5fd38eb9f08cb704
SHA512
dba332c649b8b05956ed98fc13f939e699fd8b7f6acabfddb69a7243c4e449a3be6ef15ebab72dfb5d906342b79753210a33415f6c079d1e804b789ab165aae9
DIST patch-5.15.197.xz 7360888 BLAKE2B
9c894232147fa560779a3d018396de0f90980b595514e354108ffa085ed527bc808015fc433f5f11ccdafb724773d86790d8f7ceb2ef44a9e76a52c794687048
SHA512
f19c09ed50116607530d7eb5cd7f1e9724aff5ee15fdf26f1f89174bf8e753cee0aa929ff5cbe0f180902b765d47062232bbe1e53d622b996e26cde172b12d94
DIST patch-6.1.159.xz 6840392 BLAKE2B
d5f15dc1fe5239b2d047ded7dc179ead7f1914900cf3fddfba28fd257edfe8671769c2a93140d0d5e064f2da80029701e2a9d70240f6665e81d594241b813d66
SHA512
feb24d4b49cfccc9f33180d19482a9cd7794f63c53f2bff249ab775bf366c9f2b698ecc1cc9a76a46a9b85c4b2105b96e44a2f847f2b15e146f5124ecf655c9a
-DIST patch-6.1.161.xz 7001008 BLAKE2B
0834839f836fe47295f7a81aef9d05d77a8b1ef6dfb0a0c25ba94e32ded0cda8796a1c8594e7e91ea26d92e93f5f5d6cb5bf73b625bcca70bd1192526012f0d8
SHA512
ae33b1b18dfbe9c32cce7315cc649f436c2df8118c0cdc401a31dbc870de7547cf733d4adf698e5a597522fb28a891ab624d995286a296aebe417d3e06a79ff3
DIST patch-6.12.63.xz 3592380 BLAKE2B
fa3c4052b06ad8b2793401040cd93bed542f46e22534597c5371add84173fe11beda6a789a8523a800d9d8813a38ebf6eb2066968b4dc08a29b9741d3a6086d8
SHA512
cf7a06f423cdde52a1a81defccf3c8533c91126be1965a279949a5ff4b91c39aad0863bd2a1582c9ef7ffdf80ee1534838d4f554e6b58a9833780e79747a04f8
DIST patch-6.12.64.xz 3723996 BLAKE2B
79527e9990c84105254f3f515906809a3d2fb0094488cb4e1d734c5ca0541553d0d557dc68fda0399ee6dd20a7f515e90b8a1fbaaa5fbeadd82afaf5d6e3a4c7
SHA512
428b10d6c34d696ba9bdd2c4e359ffa5a5c56cee3b0d9790e231a0eb0a365272b54c0cdeec6ff31af6f3190adcd5cf69fbe2cbdb47de3b22e449e1fcd0cb480b
DIST patch-6.12.65.xz 3728296 BLAKE2B
eddc8ef3db5f267d11222eb19b95c6ee46bebd63abc7e107b10894c426ed3303537522738e1cdb14f6feeaa1c513fc415e57e35b247a7e361f6cba42242855fd
SHA512
668f8af255a429048875d23c0c859d763ee6998d5205bd4e1614dfa46dfb389c8fe14cb29a22fdb6989f289c477bd1d1afb28be77d4c7ba933f10a6b4332e609
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.161.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.161.ebuild
deleted file mode 100644
index 2518691424cc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.161.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-BASE_P=linux-${PV%.*}
-PATCH_PV=${PV%_p*}
-PATCHSET=linux-gentoo-patches-6.1.161
-# 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=20260118
-
-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[@]}"
-}
