commit:     978a071947bcf3f429908532077053fb0e529163
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 17:04:16 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 20:01:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978a0719

sys-kernel/vanilla-kernel: Bump to 5.4.102

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 680d8fe6797..30f2e1f9c31 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.4.100.tar.sign 991 BLAKE2B 
f1442b1523de568ed757ab3ba89d571b0c5d85a1
 DIST linux-5.4.100.tar.xz 109081252 BLAKE2B 
2647a326c55050c3f0340c2e7ce98761e8bc3d5900c74785eac779295ba6e84d99d65a2ba9ab575fb412bd5caf6db6d25b32ce9b10373cb3879de2cbafd861a0
 SHA512 
8483e34ac7ac59903d51ef2b5607fa2608a824d0f95548f3c8eeefe9a6b4be3bef44865df68960feacd02ed7bc8dbbb1625f0bb8e6626bbf096c2a0db474998a
 DIST linux-5.4.101.tar.sign 991 BLAKE2B 
f10908550c9ebe18dcc06839046ea215d5fa91cef48180836c2582a3200852dd005e39ff5ed6b203bc5ffb4098018fe2437d363ae84404370a9f40e8e92d446d
 SHA512 
bcae0baa578b248d21b270106b5ba0b4ea23f383a24086ba04d7433c2df534ddac9f2373383407637cc3a8e81d14e3f5407dababc3b01333bbeafd36101e2f54
 DIST linux-5.4.101.tar.xz 109078848 BLAKE2B 
9dd7727655005ba2bf906fbaac86107dbe541cd42878eb3fb96f9731e8196b4e059dbcd772e7c11c620ef784d09ed353f7d92e2388adecc0906d1c71fc8edea3
 SHA512 
225d5aeb1e0aad9f048cafe94477c8ea5123f26145681b2a2fe24f81dc61694f964b585b6cdc63eaf3898e5feb38159097cb611b9e2e2455de331e6a4875970e
+DIST linux-5.4.102.tar.sign 991 BLAKE2B 
5a839b6415817715eae350f2c7e8f1b8711c41a1de5ac2e545d1538d5351e37198656b46f2a086d00905fa4f28bf5658f4abc608320e4015885f7dd675328361
 SHA512 
22cce67a245acd8b9a1c21a191e9ed10ee992631bf78f14f55b34b9f977650ee715302cfe4401b8681ce1758a63e25a6e6cbb7493d7fd3cc9ffab132056e631e
+DIST linux-5.4.102.tar.xz 109080872 BLAKE2B 
bb4a627999ce6ecea5a8cea0fdaac5b3443c9168a381b0ae8c86b1a07554cdfe0e0b395246398f21f082f153602335b1768fe060ddff4c3a83c4ee040ee708a3
 SHA512 
385a075e2d68d9d90c77183d743766fe5f6d9a279e8e4e73aeb916adae0fd17fc533cd944c14c5cd289e025f880dcb45211dac0ab7fc227afde4f8b7afd5689e
 DIST linux-5.4.94.tar.sign 989 BLAKE2B 
779a725d0164c98bf2ebc0590af693eebb6fe71837e0f8642b376fb0fa4bc893e8c2b52a16bd0c1cab7aaff4295f6bf31b8fdb7c2d95bd8601eac74925e2211f
 SHA512 
85ec9c16642aac5640d0486ba704b787e2e4156fccdf80f4d538b4d6524c914b64e6ba1d52bdda15b3601faec643d6656fa2cf57976a9afaff5265f9dea840e0
 DIST linux-5.4.94.tar.xz 109082512 BLAKE2B 
fac6683453e41065760cbdd170ea4a5f72778e39807389d2f4c4dd9165dc1727a875ee26e6e440089ec2d8e8b4dca9fa1e1dc02a9b217cada700f9a118ae7613
 SHA512 
2d9f0feeb9ba6871d31c8a5e281c8e3eed99ce7da3af3be4f222db37f082374f852021a5117a994c8cc37681e5f335329c9e430e7edb835de801c901765a505b
 DIST linux-5.4.97.tar.sign 989 BLAKE2B 
767058a0c491aa1435d5dcd25d5f26ed1dd283cbb903063d00020e2a5e7a2a965b7774df3fe4e5484bb1c76e906e9622057f60420d9dfe31a5305d85b15e2d1e
 SHA512 
09fc4efaf777d12cfeb61e7d24651ca68461c108666be90bf216ee5586cabf47976d60451f8cbdb636ff3f3a4b66b84edfc0255b26d3589f918c22aa394dd76a

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