From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F162113835A for ; Wed, 12 May 2021 18:22:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B15BE08F4; Wed, 12 May 2021 18:22:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F9BBE08EF for ; Wed, 12 May 2021 18:22:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2CF4335D7F for ; Wed, 12 May 2021 18:22:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CFBD75D for ; Wed, 12 May 2021 18:22:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1620843713.b8a13848f2e982fcfecf3e827ba033b7ca656a85.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.10.36.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b8a13848f2e982fcfecf3e827ba033b7ca656a85 X-VCS-Branch: master Date: Wed, 12 May 2021 18:22:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17fb7b29-e383-4728-bfe4-537d89d8faa9 X-Archives-Hash: 9bd76a5bb848cba0632fc9b546262c5f commit: b8a13848f2e982fcfecf3e827ba033b7ca656a85 Author: Michał Górny gentoo org> AuthorDate: Wed May 12 14:02:52 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 12 18:21:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a13848 sys-kernel/vanilla-kernel: Bump to 5.10.36 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.36.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index b75598a23b7..c590bd10c1a 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-5.10.34.tar.sign 991 BLAKE2B 11b58495acd1e824df55cb161d446363962d4a03 DIST linux-5.10.34.tar.xz 116317936 BLAKE2B aab0b8ad398f260213a64f5dcb870dcfabd9b803ac6e707d4f22bb3138e178e0f0c6058acb668e4312f249cbf2382786435d45b8b5a0c64576ec877b9bcc58ac SHA512 c665fddb50d93731ef32c0293cbc0bdf7eba10ab7f9614879d88e54f86419f43ad549ce3b42621e2f26269c757e1dd849fb44ece5b4bfb93da96fbafd519fcb8 DIST linux-5.10.35.tar.sign 991 BLAKE2B e4e1400e6f711b2a63c752c9c50f27b3c1a6a206b40bb73799869b485575fbd6dbfecbc30a103b0b8b461605b1703f41e627009ea3b6f6cda4a3d013b6154f01 SHA512 64618b2bba7c2cb586b60be55e8ee8bd1c8b50aa12955d28a8560153b2fcca9989bf592122089f965a5b1ae086fe21dd6d5b9334752b4bf862b49cff18c340d6 DIST linux-5.10.35.tar.xz 116318856 BLAKE2B 7fda17a28bfd43b3df4921ce58771cd2c75b9099742f2da33c948cb9d689e06d35d3e90200737a64cce9fbf12dfbb9313d94da6692f28b49b7e3f8bc5bf4ba5c SHA512 62a9ca994af58a56e9b4a0d1a773fb3e9ce885e7559449f94f475773abde41b93ca46d8020abd3691916413f1965eb5c6a3f3e22bfee977829894d6613febefe +DIST linux-5.10.36.tar.sign 991 BLAKE2B ebb44fc6c46d2ddb2107a2bfa87ff01f81d13790a863f55d589f4f1d334ee6e4cd679b18815ee1c7f6e7c9e10399a106a70e51ecbbfb7fb46ce4fc4b93d3fa1d SHA512 3c54c4df13070b6cc9fee1af069f089dfed30a8b4f63311821c705d55c73f65cb565710fb0f6be6820820240c7cc2c17a46d7ff32d870edfee98cd7f598bcd45 +DIST linux-5.10.36.tar.xz 116328976 BLAKE2B b211e6035c43ececa1a58d9a074b5d765fac5f77c1919abc22d7f33976056a61c08c063c7ade489feb7e38ac919586b5376d1174f9a5296543c5fceea00361f2 SHA512 997df1c9fc077322e69d5c517a793674047dd46fd681b4f617d513ace3b57b87eb2c7fba02a9bc17a39d58f852643e2d19cc23dd000566bafd69182c089f868d DIST linux-5.11.13.tar.sign 991 BLAKE2B 32a8fbb32f1c1b6480377c76c157a78436399b7cbdc153650057780e92f8bb5cbbc0c352a2ed9fe8f61c481be874df9e30e96c2fbd2eb9040a4d979eca5d0e8f SHA512 d0e4df56efed1ca900b206f25b6639fcc502c9a5ace9d7f40dfcd2144e066853b8168774d430717511a78c54faf5f3d9ea58db1f37c89efa13ac193dc22c8e02 DIST linux-5.11.13.tar.xz 117652480 BLAKE2B fd9537a0eb265660ed25d12ff4098ca208035576c580f81cb6a1355eedde2748bdb65521641f68e626a1aee49e7494c79627015a376b7ee4a6373622605ac760 SHA512 6502370280f3bb9d6d91a7aab1249406fbb1f9897eb62baf8bd72bb5845b0ad95931f94aa72de275fb05a36ce1f0d7931fdf53de93a507043f260116185643af DIST linux-5.11.14.tar.sign 991 BLAKE2B b1a33b95e3745ff9bf361614daab255cdc90ebc51c243d4d5101ed24e911b3be357dc12d4d6aa453a957cbd0a9cfdfb1d1e76d264806b9ea4c836a84fad96bfb SHA512 d21bd52c50453d63ff68b8c79373620ad6d29b4becc09bc16b3898eec70b24084cd5d718110f78226b1eac9fae31b6885667da452741b8f30634e13ef4201fe1 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.36.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.36.ebuild new file mode 100644 index 00000000000..2f0d1faa9b9 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.36.ebuild @@ -0,0 +1,102 @@ +# 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.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=5.10.32 + +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-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="debug" +REQUIRED_USE=" + arm? ( savedconfig )" + +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 + +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-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.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 + ) + kernel-build_merge_configs "${merge_configs[@]}" +}