[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

["Sam James" <sam@gentoo.org>]

commit:     e3b840cbd436e35014642ac6456a26101b0854e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 16:55:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 16:57:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b840cb

sys-kernel/vanilla-kernel: drop 5.10.100, 5.10.101

Bug: https://bugs.gentoo.org/834729
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   4 -
 .../vanilla-kernel/vanilla-kernel-5.10.100.ebuild  | 131 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.10.101.ebuild  | 131 ---------------------
 3 files changed, 266 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 03bb672e2d71..98cbe04e6406 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -16,10 +16,6 @@ DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1
 DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310 SHA512 e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
 DIST kernel-x86_64-fedora.config.5.16.8 216500 BLAKE2B da5d13e4d2bae7e06768f6d1a478f00e8d198339a3961b80fe3a459c74908f675d03b04c59a20f9b607048189de9dd82ba0efc5d474bc6cc54d2395dd5c19c68 SHA512 9e5ac243e1c9f55a3df09dd4f0a0e53b34a557a96989250a5f0649142639d22bc4d12b57d49cf62051f52a4eac040018a97a839164dd72eb16118a6dda3d5ba9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.100.tar.sign 993 BLAKE2B 5f1de1e82b12d25802965038847a5aec97b2dfa055f645ac43a9e9d98963793b56df5cb057d587880fa28b86450655e35e6daf651ef3dace51aef34ece224bb8 SHA512 ab495500485f52a14b4a590b67564b1d34ee9e8e4f3027836db91567e0dab33e0e3ef2c4f55b6ba3ba16a2e487f06500fe1df73966e5c8b844f43c0ea53418fe
-DIST linux-5.10.100.tar.xz 120379824 BLAKE2B 670a674351eb35ce33be67c05e2d91de3f9f3346d3cba5c419286e279a647cb901aed4506f5a50c28b36df0ba14f66f896dbebc2c99d459a3b8a6a5944899386 SHA512 c20da85f73f46dfe6f65c6faa1739816a514cda6b5caa78b9ee21030489a94cd40fefe09ba2017eec9b195ecafde3aa1146a353204adc7575413a0f67abf91cb
-DIST linux-5.10.101.tar.sign 993 BLAKE2B 09edcaf2e47dad78efc4f5d551b0d382b2807b1c5d34f911884caa5834ba9f731221a67b0c0e73cd8e072cb56df98659d55ea4946db17e348e3015fac51f8a9f SHA512 d54da62ac73002a6299b44c07fc41d4ff1c156cc73885b9324e458d677c9ca2bbb066e3faeb5c820e95b3410505cb1b62fb65b42c9bd76c3d24abfbf49c7e62c
-DIST linux-5.10.101.tar.xz 120405612 BLAKE2B 138998dd71669ec8c9bfb5a2c176d8f336d6dcf96f749deed82505acfb0f1d658b792eb01e96569878b01d6aa5600bc29882b27933ae40681d575da56bc2718f SHA512 930a38f82ca4a5a444a04fe71030be4dc10fb2447dcc73d88f3650e5239dc8a67116d4644e6aef1dad5f8aef17299bb6980fcca5a12522928a8409460e0bb5a3
 DIST linux-5.10.102.tar.sign 993 BLAKE2B 10a0889848b5198b4bdfe131b34423eb0e0ce91b6df649b57d088e1116008a2d940060bc3b4ce9e24c5e91e78b8077a00c50dada776e42039b428e90e08b11d5 SHA512 7f20c13b2abe6ecb15f4d3bdc36c8d61b2065c60d9ae3f9310e1f763e2f7e3594df788f549b21d6961193de53c4b4ac9b589e243459de7cf9f8a988f2d919bc9
 DIST linux-5.10.102.tar.xz 120395768 BLAKE2B 50bd2d608b193d25defaf347ca17bef198c46da9dc9a988510f038857a49b8054dc75adbf90bf48cfaf3da179bba776f0ffb1c54a965a5d7c3de19d648658407 SHA512 08f5a50cb48e0a58745a4825bbff49df68c4989c241eb1b0e281c69996355fcc84f8aa384069ef2323c07741240733c56a2abb8e85d25e122773ea465af5c57f
 DIST linux-5.10.104.tar.sign 993 BLAKE2B eb6ce12c4b0dc92e2a0fcf60cb667974ab21380d84afb87b3df15ebaebeb9647f176e8d974fb6502a52560206a7c50ea30c366f0b2c5422c3a8bd71943f13146 SHA512 9fcecbdf7d714f0627b57ba90724e93fb011931899e4b0f44c8c0ff3cba5f238120e84a138c5389e3f0317705558ca4aee1a766a8872f6658be18c350055ce00

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild
deleted file mode 100644
index db79c9db5598..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.15.5
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~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=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.101.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.101.ebuild
deleted file mode 100644
index db79c9db5598..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.101.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.15.5
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~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=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}