commit:     7f3bc28c8c53b49df9e45275417538c71acc3920
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 18:58:47 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 18 19:01:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3bc28c

sys-kernel/gentoo-kernel: Revert "Bump to 6.6.91"

This release fails to build on x86.

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

 sys-kernel/gentoo-kernel/Manifest                  |   3 -
 .../gentoo-kernel/gentoo-kernel-6.6.91.ebuild      | 144 ---------------------
 2 files changed, 147 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index c1423dd2decb..0ea6e199d4f3 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -47,9 +47,6 @@ DIST genpatches-6.14-7.extras.tar.xz 4052 BLAKE2B 
1089c810902b96b2d17ebaec90ed48
 DIST genpatches-6.14-8.base.tar.xz 707352 BLAKE2B 
34edde67b70c11a911daaac12859b5c70708325eeb50694db276f4db877fe01e78cf2e4f431d17813b1b537f17b522f66f29611e59fb8a3835319b9416272468
 SHA512 
3bf757bec0226b0fceb6b9f36dec8e9bc216155886e1452eb417906ea623bcc99a47d3dde6f88bc91bde85a0523feb0478376f4d089669493f10ec6e6b9d21ba
 DIST genpatches-6.14-8.experimental.tar.xz 79820 BLAKE2B 
c14deff3a3a80ed66c15541a4f270bc39ca3926f371ce4e736af65543f482688dda8c1cc217c6e103ccbc704c97f946cd2ddb8c9e66437b92af7b9798d98d02e
 SHA512 
2b072527679855a740f88c8caf8cdf8614dccadbc8f5347a003c0806c94a1f7c491baf72cce7704386001fd42d4e544962ceb944f4d46f872d8a3810e7fe98e2
 DIST genpatches-6.14-8.extras.tar.xz 4048 BLAKE2B 
65e31008d0ac83016ca1033eae0910fbdfa0db2cc976ca9fd0fcb431f833ec38a1f3e7a9cc74f229f20f919c6715ecd8b49b2cca142bbdb3173b98ffd703f58c
 SHA512 
42b3bb027ec5b5a4b0adc2d0991ea303862727b9f4473e495af45349b5aa31f8af0a9467a2414baf1bbfe53383ab267e63ecbbc76e34c16e7ac4705bbae48b34
-DIST genpatches-6.6-100.base.tar.xz 5044448 BLAKE2B 
dcf26d017f4d9c46cb94fd5aac80d9ce401e926190de7ff0e94db221c2be84891737515c7e6acce193a1dae837079de58486eaee01bded8a659ccfc652c87821
 SHA512 
702adf2b87385adcfc752d973b49fb509edbfc7b8298a7b639c29d6df1b2671a3130f8bcca7be40106c0b38a91e81cb6dae3de80c27ec6292d8e4722625cc9fe
-DIST genpatches-6.6-100.experimental.tar.xz 6052 BLAKE2B 
96b2aa1e9f50826a816bfbe749f18c2383cc384923f8d13300895f76b7b7e9f1d209c1b67a966d09f5709d2733d3b3f8a330920ea56686ce1ea77e62ed7aadeb
 SHA512 
6fd86a3871a79fc9f33f3bf53d31a4e7a987e5d48af6d2b9225bd2ea5265940e84f201323f4f47df7d3905cd8f9785a238d10ad0238309b79fd5c11404fe9cd6
-DIST genpatches-6.6-100.extras.tar.xz 4052 BLAKE2B 
07e0f1d3cc2e2d7aeedd57ff1f68815caf8cec48a101d0edbe63ce5b50fbd7e3f26edf01d32a5c7e159043dc10b83841c85bf5b073006c96a9d9cf2e5a80e974
 SHA512 
376f8dc478d31d2596694b3efb145891468e1c597eee8e3732a8229107e80b55d025b2dd420932668622b830ba22ec5800a6d3b80b5566e5069a55f7ee4d0eb9
 DIST genpatches-6.6-97.base.tar.xz 4911476 BLAKE2B 
8bc5c6548182363c183b3fdfbf53467a9e973d7eafe6bf31b62be93a70cfee779b1f6a4e87051a76991633853d3540504e02230bde8f02bdfef32b2254218d7a
 SHA512 
a6c3fe80a1f285297cdd61a254c1a995e714614f2cc5945074e8e65890f4ed614ef58479b10bbf356343dc9445bb88ae596c794ec34e79106a5e21e7097ddaa9
 DIST genpatches-6.6-97.experimental.tar.xz 6048 BLAKE2B 
84484d8d37812c5df2bc2d43c9f9812c3c22ef8206bc400c4151b3c920c49e28bd9ef8310a9a30e40a10e58ae1d665b91371605a0ffe63ecdfdbbc2c5e837801
 SHA512 
a1415f4613d5905d9609a6bc175cce0a0087fe283abb0624e4917a71aeefac96edd347f865316a50d2e64851dd961975bbf6ee789a304941a3d77d19f38dc796
 DIST genpatches-6.6-97.extras.tar.xz 4056 BLAKE2B 
ab29ea3f128eafcd229aa3280ef690e4e5d3f83fd4c85a4118a4c8ba5c1d5f7bd87c30659c972f917d193faa3261f1daa0c5b7144fe4c7be0247e78ab4285d76
 SHA512 
e586afbab5068e21821a0722f903c232dd36d24aad3e72c451870c52fdd37d5a8b43e2ef818340b8e9f9e49fa5e05684cf28465bb3b6e2a21a49d78b37e50f3f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.91.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.91.ebuild
deleted file mode 100644
index 03e78108c7b9..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.91.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KERNEL_IUSE_GENERIC_UKI=1
-KERNEL_IUSE_MODULES_SIGN=1
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.6.12-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
-       experimental? (
-               
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
-
-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 )
-"
-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 | 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}/${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
-
-       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
-
-       kernel-build_merge_configs "${merge_configs[@]}"
-}

Reply via email to