commit:     3cea8566ec1b3f442c8d3eaff33bb1c9ead48866
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 17:25:28 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:15:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cea8566

sys-kernel/vanilla-kernel: Bump to 5.4.98

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index b515fcca005..bf27272b681 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -47,3 +47,5 @@ DIST linux-5.4.96.tar.sign 989 BLAKE2B 
b4641189da90cf6e854d9ff9d5cfa7d6f559f4f5f
 DIST linux-5.4.96.tar.xz 109075552 BLAKE2B 
b6e604030f3d1f14880a38ec65d2169e668a7eeb43f21045fef28be98560a7fcc91189149a3ccbf2500f3d55860ef71351ea1c79cceb940c67beb6b01149c912
 SHA512 
4f2017c374af9485aaec6fc021cfa22a1f5e635a2fca7ffe5cd535306a93d3ebcb985d30491f7f4e05ce1d91647ff62a41e766a677acfa7f5b0269b808e069c4
 DIST linux-5.4.97.tar.sign 989 BLAKE2B 
767058a0c491aa1435d5dcd25d5f26ed1dd283cbb903063d00020e2a5e7a2a965b7774df3fe4e5484bb1c76e906e9622057f60420d9dfe31a5305d85b15e2d1e
 SHA512 
09fc4efaf777d12cfeb61e7d24651ca68461c108666be90bf216ee5586cabf47976d60451f8cbdb636ff3f3a4b66b84edfc0255b26d3589f918c22aa394dd76a
 DIST linux-5.4.97.tar.xz 109075272 BLAKE2B 
d8362d202d437953fa7c78a1e7dc3eda31d1fb605b176a92ced0b9d6608c92134fcf1ae8426308f07d5af5cb5fabbee6122cc30bff8abf6a99dc4b5848d3a16c
 SHA512 
fb882d5949ac0cab2910947cc2af3c6f219ff4d8b6941100972caad8133486678a2dfe8af68c9d527a2f55b663a96dabf8c41ea85d941c04934016a0c067eb70
+DIST linux-5.4.98.tar.sign 989 BLAKE2B 
ee8047c7ae8e2e18fd41207ff47279e6de27592f1fb39c7a66de807683ca71ede5b6a4b03b0e1a8168f1dceb9c95bdb0320f18bd38972f1e9147131f15a5b965
 SHA512 
bf15885a58bc9ea4859de7a99bfa83bf7dea6133a176dc32f962872adc8aca93c63fdfb29825e01b037ff3bc2a38e5da6b7a5ea64e0ec56799074a22c576406a
+DIST linux-5.4.98.tar.xz 109073788 BLAKE2B 
d5148ab8150289b8e0088949ba5807a8f5d255e4d6ee5b6c1f2e673c9cca8aefc847f20d27f9fc2cd59b74c2c127d78c99b28d861804225db840ebaa0335296e
 SHA512 
792175fabc62b9202e2bdb483668b097d11485913f777c5dd8669b6aff1b3f414c3412d6cd5c0f1474c66119bc4bf9c9e6f88169034ac6d01d6b4f04cc1fcc26

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.98.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.98.ebuild
new file mode 100644
index 00000000000..f8ec23f5913
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.98.ebuild
@@ -0,0 +1,106 @@
+# 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.89
+
+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
+
+       local merge_configs=(
+               
"${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