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 C560E13835C for ; Tue, 9 Mar 2021 16:26:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C5A7E085E; Tue, 9 Mar 2021 16:26:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 87716E085E for ; Tue, 9 Mar 2021 16:26:08 +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 6C1D4340988 for ; Tue, 9 Mar 2021 16:26:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C05C58F for ; Tue, 9 Mar 2021 16:26:06 +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: <1615307155.a1dcac93ed69466fca7d797317dde3e5ee01da59.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.22.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a1dcac93ed69466fca7d797317dde3e5ee01da59 X-VCS-Branch: master Date: Tue, 9 Mar 2021 16:26:06 +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: dfd8fe44-6999-44d8-8b14-5542f441f60e X-Archives-Hash: 7d4b7a7e9154a04fb842b2ee4af35b00 commit: a1dcac93ed69466fca7d797317dde3e5ee01da59 Author: Michał Górny gentoo org> AuthorDate: Tue Mar 9 13:49:25 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Mar 9 16:25:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1dcac93 sys-kernel/vanilla-kernel: Bump to 5.10.22 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.22.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 4141ff78d17..c625b41373c 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -23,6 +23,8 @@ DIST linux-5.10.20.tar.sign 991 BLAKE2B d28c5eb090749842d5787bb114f22f1548decb03 DIST linux-5.10.20.tar.xz 116279592 BLAKE2B 462b29fe4147a1a19be7a15eb4aa62cd8d363edf406d78e1b02591654ea983165091aeddc1925a21e4e16251464f978b92cb85ee451944172eb777690271c0e8 SHA512 487f96d0e9117c532fafbd0133ed514ead8238cde8bd285951a33853e5796a1c1407447278b321b61c59174fc2bd79d071b1354b5fe8dfca5acbd7fe623a6bde DIST linux-5.10.21.tar.sign 991 BLAKE2B 62bb9bb99cb77dfdb71fb011a7aa46e621439b547f20cdb63dbd022fb28bd858a8e34fce2efc44066135694a5d786a044b562bbd1a450b793954b121b6b205b7 SHA512 10138b91353dd5308f38276773d649e18d67f8639ae27b3d8b80707e78e25977bce3c46900173a49a7ade04b2006f4725eff2287855ba4ab04de678e0428a34c DIST linux-5.10.21.tar.xz 116287616 BLAKE2B 620ed40ec678f338babedd25c6544f259218864c4b4df531e5940b73d04b57526f55d9be95c0ae9c2f69c861afe79cadc1097404c898e8b41726ad5bb1275b21 SHA512 be513c05a41750b4acb27abee6c55960dbfd1fafac581dfb35448d5ebdf89cb7af8ae6ae828d1b0c09a758bcf0ef99cd79474347107d12accfd9a1d3b1455c99 +DIST linux-5.10.22.tar.sign 991 BLAKE2B 9e4656b6815864fe046a59492902bee46d334f360d88252348f27a3baab458354e6781c0b168dc9958083af3dc564a56a8a6adbbc0bbb1cbaa3b8ff4dc8d1b7d SHA512 5274570bcdc323fe3ebd6b3fa59ccd64e72309102397a9f951e375ef84b7295f6c008518935b5c8db900120f241ce844a9a96e9f4cfdfba293da72fc1e495460 +DIST linux-5.10.22.tar.xz 116291148 BLAKE2B 15f6e14e133ef69a932a82b68aa50382d5dad54c593e6934f769306b1144ad526d185a3dce283bd7df3cc90053f31e129b7745a6c3d69ac50c3aafe03a950107 SHA512 0adcf5973674ceb648fe073f369c395c7e20b2b05ad9c3d27617a25b23f34aa3e2fb07f6ac3debc0199bbc971d31da4c8cff5daa923ebfc2ce31c16117fc5e48 DIST linux-5.11.2.tar.sign 989 BLAKE2B 404589119de8a0bff3e0feb77a54eb98add568470d4260767830ecb488fec415a0eb79a87eb6b19963b26a78ab8944d4041a38a80dc515f42f14350dcf825fcc SHA512 497f0c06d43cede60cb60816bac0cc22a3c7976bb71bb2f2aedced69c44561b842bae94cf51d5cd0ed506c1eb5b58c038bbf17049176f074cd0e7442eded4fdc DIST linux-5.11.2.tar.xz 117609344 BLAKE2B 62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc SHA512 16090ec6dea7a8c417ca7483b296902c9b55b423482ad8a881dffcaae76411806bc9502373efd6a51b0acefec3a44c19c5a7d42c5b76c1321183a4798a5959d3 DIST linux-5.11.3.tar.sign 989 BLAKE2B 32a3eaf0cf1ca17fdd3d541def9a6cfb04d6b9fa701df737cb7713c7969a7452a5b8366751c6538f5171af7875382f2c3706d968f41ddca49a00a46b5f108dd0 SHA512 719150274d08392b51564ac35c45a6ba987ec329d69af28351a0f8842114ca30ecf23d025594ea3ed8280adfff7ca88754f850f512acd493059c71c98d9a7c13 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.22.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.22.ebuild new file mode 100644 index 00000000000..fafae29a72c --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.22.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.18 + +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[@]}" +}