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 1C8F513835C for ; Wed, 12 May 2021 18:22:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDA96E08FA; Wed, 12 May 2021 18:22:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 96A68E08FA for ; Wed, 12 May 2021 18:22:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6483A335DAF for ; Wed, 12 May 2021 18:22:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A8A9787 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: <1620843718.77bf60557c327885e58bbed9b66f769c8f076ba2.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.11.20.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 77bf60557c327885e58bbed9b66f769c8f076ba2 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: 2258deff-4b4d-478e-ab12-1eb0b8c828db X-Archives-Hash: 5c83a76db4e972aec20372aabd87ae86 commit: 77bf60557c327885e58bbed9b66f769c8f076ba2 Author: Michał Górny gentoo org> AuthorDate: Wed May 12 15:31:37 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 12 18:21:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bf6055 sys-kernel/vanilla-kernel: Bump to 5.11.20 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.11.20.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index c590bd10c1a..cb8db89e682 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -50,6 +50,8 @@ DIST linux-5.11.18.tar.sign 991 BLAKE2B 0fdcf89669e1fd7354193937b45e294267abe111 DIST linux-5.11.18.tar.xz 117664556 BLAKE2B 2ec1a9577dff7e68ba71b63debf0ace2f9df639ee7d6869651890e9ca20850807376b6bb0bf11ef3350a32d49385701b7b5dce8bf6543ca760fa93aefbc06add SHA512 c719d36ac8941dacaa5cc3ffd82d86a42716316e41b5bdb1505ef5e6a0a1fd93fe8135a5d05dd14a6e6883e5e9f108529283e5748710ed1422687a49d9b0284f DIST linux-5.11.19.tar.sign 991 BLAKE2B dd9660d1124e94f845d6707f8f4a69d716ed29ec64f4979525cc36891d4c8408c51db464a0d6aba67583df9b7f0f50e336b9842e1f13d6bf7882c6349f83fab2 SHA512 d1e8d0a8ff053507e91378888a3f436662884326fadf0ef3a629eccda91f12e82cdd8f932e01850da92e802a494b2aa069c11fb959b97f3f2fcab2e11dc7cd12 DIST linux-5.11.19.tar.xz 117655700 BLAKE2B c5d805c8eb16922e0e7c675406cadfc5414126973599db5c07aae02661eefee237219735eff8b459c0e07fdd5f54962d03a6c80ef9bf730d6a68c8286fd713b0 SHA512 92948ff856b16143cc09f4ef2d62b732bdc0e26aea572999f094309ebc589fc2982ff7f5332a3d98e787127fb2f2e893e68dc0b1339b034cb9f847700611ab8b +DIST linux-5.11.20.tar.sign 991 BLAKE2B e6dafa9f4cdd4614314dbc51772fbf203714417e0a5ce4f20677fc4cee2a4bd4a71c9b88d464aebdd795be51ad35e41981561fbbf83e4e367d1c925fa697dda2 SHA512 5dd6d0b7b7f1983a15ede85960ee12c1498afee6dba9121b69bc5a0e358600f29d2bf0558a291d041ecb0226294f1f9c410ab7e870dea4e39e8cefd03accbdf2 +DIST linux-5.11.20.tar.xz 117658868 BLAKE2B 0e2a11596f33558aca0fa91079f12eb9a20e83f7a7a502b50a5cd181d0ebf9fa6a4f511f87f5f1f3f1e6bc431eafc248a86aeb0b626d4684845d9d3be023cfbf SHA512 45932b41e11040e704a3c1fd1144fb8eeb5dae3832dda2b2fa133135b560d30385e13b65c9ea368273c68d9b61f0bc0d70f521edcc27fd14b23b18eeecfc0713 DIST linux-5.4.109.tar.sign 991 BLAKE2B 6701f7e216c48473c77140a4845c07726bc5d64956fe62e717871a379aef7dd966ded4101b2bf8d6b509508d50155e7cfaf9b87668bdce1f27949b9b05a5debb SHA512 53f5c65ce93fcfc81792b9e706b4f49963772e7c784c7c5c67f323b840ba5a99a16ab889376c734ac0e044fd3b396795511fb9bd8b19f28f5e0a4dfaa5e7500c DIST linux-5.4.109.tar.xz 109086324 BLAKE2B 1c989bf67953ae03d1e6fabbf653058d070aeae1e2d10680c8ae3ef96e42d2d3f44d0a40374fe30c547a53118d37fe25632ae81cd4b497cb5fed8db5ee0eaf4d SHA512 9c41d52c9a76088f670e81aca5d5a62c7218ea496176ac92823594a99893e1948ec550ec7d3434a455de1f79981c3d5b80c8520c375dc50b23a972e0bbe3b78b DIST linux-5.4.111.tar.sign 991 BLAKE2B 00ea726e62ca8810210ad3be33b40f46cfcd3daeab510b0b16f4788c37e576a0018ddc1e2a280c32a3a574fa89bd929af25d7516efe5eead7dc90bd9c55da199 SHA512 185804fd5afc9cea54911d0228b79860a484d2c45c65e68545944d5818397f735352f0525506685b2f7671de669db3ad6ea5b3ca1f873e8b79b1641eeed7c848 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.20.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.20.ebuild new file mode 100644 index 00000000000..9d1edee058a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.20.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.11.16 +CONFIG_HASH=020a7e573eb59b9d2b935e955c62c987e04751fa +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[@]}" +}