commit:     c9edab2c39f0664706cae8ba5191ca067cac37ea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 20:48:42 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 22:57:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9edab2c

sys-kernel/vanilla-kernel: Bump to 5.4.99

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 75882cc6d41..800ebdedf59 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -51,3 +51,5 @@ DIST linux-5.4.97.tar.sign 989 BLAKE2B 
767058a0c491aa1435d5dcd25d5f26ed1dd283cbb
 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
+DIST linux-5.4.99.tar.sign 989 BLAKE2B 
92c51f2da875787cc3867319e8e174925443bf43cf07f9dd54d31ba34852e946ae73158db1dc6532c90c3589a3e6bfc27cae42ac22359a2b15999cdf5b3d008f
 SHA512 
5c332cc60d29d615354b1e555dde31e3aaf8846ccc8c4bfe7bc5ebdce20d4a491af367388f1f07feed81f6eaaabb1baf4afc9d995f00541843f2d18eef9c2580
+DIST linux-5.4.99.tar.xz 109078664 BLAKE2B 
f0a869edf3aa04a2211f039561fa16a419ebde44437c1aca9ac8a7f11ccda240b58eef45c2135a4d7ccd4b7093cf5ce758fba1ed850a653c2debc33f90d4ba91
 SHA512 
e064ff3c68291c7fb6823499230b3838b5a9471d9e0789ab6eea89ac1cc9c579dc3670dfa3f64cc0c2b68b8027cdb2a239158da73ce7febd600d424eafd6d203

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.99.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.99.ebuild
new file mode 100644
index 00000000000..f8ec23f5913
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.99.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