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 F0F62158012 for ; Wed, 22 Sep 2021 17:27:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E77DE07F1; Wed, 22 Sep 2021 17:27:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63463E07F1 for ; Wed, 22 Sep 2021 17:27:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7760A342F8F for ; Wed, 22 Sep 2021 17:27:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3604105 for ; Wed, 22 Sep 2021 17:27:03 +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: <1632331609.aa43e072214583804db226aa534c91fb9a01b18f.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.68.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: aa43e072214583804db226aa534c91fb9a01b18f X-VCS-Branch: master Date: Wed, 22 Sep 2021 17:27:03 +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: 839cfe07-4a31-4297-899b-630527276c20 X-Archives-Hash: c95d0455a78b3d023bc6bdfd87fb6fec commit: aa43e072214583804db226aa534c91fb9a01b18f Author: Michał Górny gentoo org> AuthorDate: Wed Sep 22 14:02:59 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 22 17:26:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa43e072 sys-kernel/vanilla-kernel: Bump to 5.10.68 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.68.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 696e3fbb5d9..121f6be4492 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -37,6 +37,8 @@ DIST linux-5.10.66.tar.sign 991 BLAKE2B fd6a57ca595bd5537c130de5daff9e237c7bc30a DIST linux-5.10.66.tar.xz 116410256 BLAKE2B af28d1eed527ae8c22d44598c7559fc15eff39aba1b837fb81fcd957fa17d2de562cf7f4f021279ce90381898025d9fb4f28053c2833ab3e49901c7e9e378393 SHA512 ac6e0eaf11cd04c3bbc325c8631dd93a34ee77784f66af8c6d2f1f13fe576a16a01c677d2da3d87a60dbd583a20e22a79cb26466275e7f3482234f439d0e524e DIST linux-5.10.67.tar.sign 991 BLAKE2B b730aec51f39a0232f4bc86e581ad635a2ef290037c9a51dbf82c4f1a9a72f2da2521b9d92590798f40ad743541f864afb19ec5f54bb147ac41a2324c66a7373 SHA512 b3b68d74b33188b0cb5f105627cac2345ad89f1e0f2d916ebe6e2d0d32194315f3584eebe73f9def400ab3ab1678cabef676625cb76bdac77fe5c8a746d96aa5 DIST linux-5.10.67.tar.xz 116423656 BLAKE2B c444dedf6911a50b24ebfd0fbb7e3fcf3e51d9baf8e382bb3f5da86ef8ba0b2a04f9a79617a59eb7a47248675dc5e48e5eb6b9b92c55e3c8cac5ebf9b5376723 SHA512 bc7ef74064d75083314d962d23755a98118e9d8af74c227c8f1f8c98df1d6f442f62d3a4f57b9e600a48aa5a576feca1c750d6e65a499d7e321a9b23d8ed728a +DIST linux-5.10.68.tar.sign 991 BLAKE2B f418314ac525edb55b161244b27b62808af563606b0f5f06542d72bca558e38dc94f5bf4be32546b3b0db3718fedccb63c9e99579bb4c829029de6a34128c5a9 SHA512 a522887a75776b7ed2b3cdcf0e8337fceaf7a60ec2f9758f805538038c9e6a0a0c8b73b43ae6d31535688c03def2d66e0d612a8f4388a583bb6cf58cbb89ef5e +DIST linux-5.10.68.tar.xz 116420600 BLAKE2B 826e796cef5be82ab54fbaefa14c104561429ce051cf2455d21da7f0a112d3ef1cd99a9ee287565792d46d4b0fcb880f3c3849779a9b04182cb897e37372b032 SHA512 9430f0b0e66513101ee4905eb8fb3cd14b7f64eb2847bd53704bfd99b1a608ec9c2ccb7de5e8bb2ce8a20d59654f94e38b62ee2212ed53461edd2fad137d2eeb DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef DIST linux-5.13.13.tar.sign 991 BLAKE2B a5f1e6ccba62297a46d60f8c33539aa04737c131dc98b72d7594597464ef6ae85adbe9a408febb9513413b293bb9601ddf864e8aa8eab34b2183f53216deb6b3 SHA512 c6d7d3e2a35f4d753f9898300cbfe5e250790dc7a12cbcf6968be15d372565a0c2952ebda82ff2870520d6e682a3e7354d726f2ade59549d3b2129857629a67d diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.ebuild new file mode 100644 index 00000000000..12c958a4bb2 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.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/pahole ) + 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[@]}" +}