commit: 93322040050f9eb61dcb08eb64966a1df09d60ca
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 18:59:01 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 18 19:01:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93322040
sys-kernel/vanilla-kernel: Revert "Bump to 6.6.91"
This release fails to build on x86.
Reverts: 72f62c56a287c7ed410d02edf4b5673ce4e28ede
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 -
.../vanilla-kernel/vanilla-kernel-6.6.91.ebuild | 135 ---------------------
2 files changed, 137 deletions(-)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c50428897d17..3aac3e5dfada 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -70,5 +70,3 @@ DIST linux-6.6.89.tar.sign 989 BLAKE2B
f7b1ebb043f3df4c4e6fb42e66fd160aec7a00afc
DIST linux-6.6.89.tar.xz 140581032 BLAKE2B
d4e5ea401fe31c1a1ede4789edd3973de8b635e571a502517e7da6e03610f02cbe47c4646b3c3da4e0c4412effd255ac9cb702a959dfee5abb01f270771d003c
SHA512
205494cd2ab60b9f3400abd60a615ebc05b0d9dbeb7ca6b3266b21d85e5382af71a6a44c02844407b5e7c10b38da99204abc61f5bd20b832cabfce9e46c1a64f
DIST linux-6.6.90.tar.sign 989 BLAKE2B
12ff9cda783a8686b9207599aebb13bde4a5010d2ac43c5972f5213edf043ff3f5abbcb89f86d50b615d28b65c15baca396b36f6cd9b426291be764e8b5c32c8
SHA512
6abd0d11b3a0a307098049840280b7201cb969d5f2d4fcf5057443d378e8b724a59edc608bfbeb4a164c6fca4fece1b6f1fc689345f913287621144e1a54013c
DIST linux-6.6.90.tar.xz 140578308 BLAKE2B
4d76b25a7592926c3bdf29381a3f84f36e2b53d8ba9a683b636d487c9a1c02f2b96da7d7b4fa11b6945d9f20d8f36cae97caa77c842b63e63ecea80eb56b6f81
SHA512
7ffc9a8dd0a1bfbc5f4d749b12886d8c75e0dd4c71917c6d838a79d2d7fd242914cef114f8ab4728fa2df21fe7d06c05a3f96d12c9de69e292a64404e8aa8479
-DIST linux-6.6.91.tar.sign 989 BLAKE2B
7aabb710d002842c353c7ffd3624d2b44fcc5687b0aff1a5928256799aeebed027b59c1c4f5f7e4ed92defa8eb5adfe23dfc55aeb85381b67bb321e16200815d
SHA512
a91eb79db03dc3d86138870653234a1449b3d3ef69a5880169767326f1bc7188e4f4c914e549d2023ccc25aae61f862d1efef8a65c6edef09627b4cc736bb50d
-DIST linux-6.6.91.tar.xz 140565276 BLAKE2B
163875e32aa3c237a535165f28286c57a80221c8535c33669606837859b390bee3312a651f529c477822b03ffbabb150b4ac1e1c4a6c07c509fe5d40f86bf25d
SHA512
ce9e19437c6c0e0be6bf29462207a30deb42aba621464a5676fd81f3886b43effd6eae8d325851e3b9f59087e7093dd453b0aa827ca38448f8721911884a4c03
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.91.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.91.ebuild
deleted file mode 100644
index 34e699b48a1f..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.91.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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
-
-MY_P=linux-${PV}
-# 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 from vanilla upstream sources"
-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://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/${MY_P}.tar.sign
- )
- 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 ~loong ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-BDEPEND="
- debug? ( dev-util/pahole )
- verify-sig? ( sec-keys/openpgp-keys-kernel )
-"
-PDEPEND="
- >=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_uncompress_verify_unpack \
- "${DISTDIR}"/linux-${PV}.tar.{xz,sign}
- unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
- else
- default
- fi
-}
-
-src_prepare() {
- default
-
- local biendian=false
-
- # prepare the default config
- case ${ARCH} in
- arm | hppa | loong)
- > .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="-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[@]}"
-}
