commit:     f57e6db32059b281ec91d3f3140bde4207c06e35
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 11:27:35 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 22 12:40:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57e6db3

sys-kernel/vanilla-kernel: Bump to 5.4.121

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.121.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 5782bc835ba..78de64b528c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,3 +44,5 @@ DIST linux-5.4.119.tar.sign 991 BLAKE2B 
87cb81f41daca05095bb0d5d66c882028fb695aa
 DIST linux-5.4.119.tar.xz 109111856 BLAKE2B 
33edeae110d1f4d4ee8c32d3d189df1b165c12a48e1cfae1eb706b5144231a49c342ab4412dfb34bd601a515a109541377349c9009cb981aa636c0aa133d4bd2
 SHA512 
bc04fea0ecafb2d34808d415d6b33df30097ce019858277a633213becfdfb0a5d908ad677b358d547354b901b616cbaccb34fa1f32bc136f0856aee8d2721119
 DIST linux-5.4.120.tar.sign 991 BLAKE2B 
12c786791b72afccc4a3f9c412b900f25355920c3b253160bc9da0193983dfaaf4ed81886e5ffc252b07b34dec6d6daa59625bf46b1ebd6a7aca8522235923f6
 SHA512 
67b32fb8cfcd125ee66201d76eec364d7d8839a3055d43eac88eb812201969d0ed9d94d8c57e9be8b35f0a8972475381c6d41e480c7c6086cf351d4388f80c04
 DIST linux-5.4.120.tar.xz 109107108 BLAKE2B 
d3ccfefaadfe4186cce3232dc0b58759914d0f9eb0ac7c82b855d0230a512b92e37801b75e32dde57ef5d6d6ee04c3bbd59f58a20e73304cf235c90c7dd2855b
 SHA512 
b376e262164d8a79a4ffe478e42e38929fcc4b7f08dfaed24a842c238d55162ebcc1f6a5d0926a618e03f98f7f9623997306ffa66c6425f3e77865c2d70e1d54
+DIST linux-5.4.121.tar.sign 991 BLAKE2B 
379897a668e4f97041f48a3a7368f13629797e4ab69cfa41b1f7911be32413b312800121e4d04daa599da8e48d13eb9c4e74302624a89f690102ef021312de35
 SHA512 
e800edee4e01f7d0b80d636438e04b3f755859560114144fb54e987a11768b1872b6b89f548ea528f06d4e23995815c582629a164130ddcfe9bed76f8bd1dae2
+DIST linux-5.4.121.tar.xz 109108220 BLAKE2B 
b1fe71ddcd3e47a653e92538ec5bf5b52bf265c4403bb856b9d0b20c60aa6abbf94db6a889f76e61e76001269f70b10600814fcd0db7ceb01089a0567ac35e6e
 SHA512 
b68a19890ce90185e5253a635f844b59a4ee83753e4bcf89015b188af741d5a9531a07d05c4430458bec9c41c89c05c45567c93f8f68f9355bf29b973ce47d7c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.121.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.121.ebuild
new file mode 100644
index 00000000000..e11e956ef1f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.121.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+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/";
+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.config
+                       -> kernel-x86_64.config.${CONFIG_VER}
+       )
+       arm64? (
+               
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.config
+                       -> kernel-ppc64le.config.${CONFIG_VER}
+       )
+       x86? (
+               
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 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )
+       verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+       ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+       ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+       kernel-install_pkg_pretend
+}
+
+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
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               arm64)
+                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               ppc64)
+                       cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+       local merge_configs=(
+               "${T}"/version.config
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       [[ ${ARCH} == x86 ]] && merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to