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

["Michał Górny" <mgorny@gentoo.org>]

commit:     913fc62c294926734d429ec6bf6944f663401f92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  5 19:36:53 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 00:12:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913fc62c

sys-kernel/vanilla-kernel: Bump to 5.4.170

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

 sys-kernel/vanilla-kernel/Manifest                 |  2 +
 .../vanilla-kernel/vanilla-kernel-5.10.90.ebuild   |  2 +-
 .../vanilla-kernel/vanilla-kernel-5.15.13.ebuild   |  2 +-
 ....10.90.ebuild => vanilla-kernel-5.4.170.ebuild} | 73 ++++++++--------------
 4 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2a33f01f5475..ae43d99a028e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -35,3 +35,5 @@ DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b5
 DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510
 DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda SHA512 0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45
 DIST linux-5.4.169.tar.xz 109192960 BLAKE2B 136c792f554832e6e52340ce935bf2f1b2b09c8bb8fab6889920b68bf27134e2d53f0228ec8ac31233a4b2a5b7faed87238d1c7d509ddd8c649ab8275a860e23 SHA512 43ba0a51c12e4366e0793217ce66dfefc13b83f0ab8a575a21058909e03f161410bff2aae272c64c5873779886d24d3fd0cc82655de5b20b428eca6cf681685e
+DIST linux-5.4.170.tar.sign 991 BLAKE2B 225477d94c3645baa345a528c341f8e4ce4c1326d4901fc6e7d6919890f18ac750597b9e20908322b96419cc894613d96e2e9f0a99fcd288f91bdd8a640e212f SHA512 b61adc39a65c6643537b47dc6de6adfb24db6406ad14c982aa2a9beaaa0d2a705c1d22eb31ad16eb9ce093a52fdddc3667c5342fc41056817e6c15138af274eb
+DIST linux-5.4.170.tar.xz 109202572 BLAKE2B 92c93457dd5cbacd2522ef71f3f5ad1ac97521ec46966ed8f46fd9ffbeaa986bd9c0ceaa96187e1b0beb76daef98ea0af1e49c2b7e92759fc7ffdf5a90204aba SHA512 aa2a36067f9015b63254e098522053993de4b31dbbf39050adbe4cec3b7e4249152ad5e154a9bf3ca2b2f60c4db274e8f4ed9df9c66d8a392653dd5de79554f8

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
index 2d0af917a6cc..54ba5f449c7a 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
index f7731de3f3a6..9fed445a77ba 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild
similarity index 53%
copy from sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
copy to sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild
index 2d0af917a6cc..a68d501c5130 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild
@@ -1,15 +1,15 @@
-# Copyright 2020-2021 Gentoo Authors
+# 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
+inherit kernel-build 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
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="https://www.kernel.org/"
@@ -21,27 +21,26 @@ SRC_URI+="
 		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}
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
 	)
 	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
 	)
 	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
 	)
 	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
 	)"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
 
 RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
@@ -68,19 +67,13 @@ src_unpack() {
 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
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
 			;;
 		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
 			;;
 		ppc)
 			# assume powermac/powerbook defconfig
@@ -88,43 +81,27 @@ src_prepare() {
 			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
 			;;
 		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
 			;;
 		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			cp "${DISTDIR}/kernel-i686.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}"
-
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
 	local merge_configs=(
 		"${T}"/version.config
-		"${dist_conf_path}"/base.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
 	)
 	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.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[@]}"
 }