From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1338890-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83D37158086 for <garchives@archives.gentoo.org>; Fri, 12 Nov 2021 20:03:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDDFF2BC0B4; Fri, 12 Nov 2021 20:03:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE7BF2BC0B4 for <gentoo-commits@lists.gentoo.org>; Fri, 12 Nov 2021 20:03:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACE983431E2 for <gentoo-commits@lists.gentoo.org>; Fri, 12 Nov 2021 20:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42BF91C1 for <gentoo-commits@lists.gentoo.org>; Fri, 12 Nov 2021 20:03:49 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1636747413.4a24cde297b0706245da6428c60a1a3110e453ef.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.14.18.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4a24cde297b0706245da6428c60a1a3110e453ef X-VCS-Branch: master Date: Fri, 12 Nov 2021 20:03:49 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fe666af-b0d2-4eef-a538-d1048ba831db X-Archives-Hash: 364a16cec41747129349b660c9b28685 commit: 4a24cde297b0706245da6428c60a1a3110e453ef Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Nov 12 15:57:05 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Nov 12 20:03:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a24cde2 sys-kernel/vanilla-kernel: Bump to 5.14.18 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.14.18.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 946b6a6d32b..c01e5fac4f4 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -45,6 +45,8 @@ DIST linux-5.14.16.tar.sign 991 BLAKE2B cdbe56123fcdffff642dcc284e6dd563ab76f0ce DIST linux-5.14.16.tar.xz 120708740 BLAKE2B e4935cb8e5cf04c100047ac85460c86bbcfd4202269d508c0c120bfc6169577e808e12f1a901b6b583b853df104abf76bb3501592c5b284a46aa0bd6ec24005c SHA512 67eb8755cc67a76ec340a0f8259ea9323f36aeb66c2ab117a66e7f160b3de63737091d3ab696142223338dd45b6c8ce08c1eacbbc6108da3e87fc90f3e135876 DIST linux-5.14.17.tar.sign 991 BLAKE2B 70aef9a667fdd9c61623731ce1d725cdc39f2fb297bc6d9ce2d380ba66d0bb812c3daa923f44f6edce50fcab7330e43e74beda531245785f4267a271f06d72b4 SHA512 f27767753d9f3db3341aab8215a434f579582d7f424702ba73a7d09b86eb63aa13b21bf7a412f539d243e7fd8e46c853c2fb10010c4567d8f8df9c429be36499 DIST linux-5.14.17.tar.xz 120712240 BLAKE2B 837649f317a88fd8d086b06f39b2ccefe40055b312c9a9d279ad366db9568979afe5500417f65cb92092f73e6b0ac9117190eb662ac0f6e620243cf1028d80f3 SHA512 7a512c923853a5d8b64fc3584f55dbc0e35188b5159a503e7559db4343d06137fb1fc86e14aa571603ce97050f35b1b32b9ac8e11d667c816c3536f77b2a3e04 +DIST linux-5.14.18.tar.sign 991 BLAKE2B c1111143b50dc9d91525d7a0e280dfd4267b5eae524836ba0e63a3b328dd5ad8302435e54fef0cecce6fa1189abda1fbde16d97fe184129e28d15bf6e83a3691 SHA512 dc359ca2a82cfb16f90fb1f741bccc220a233fb6f471c712e46e929d5e0480ebcf19905d1ce47a667f3f11fcd90d57d860f429d28b3535d16efac1f34a461a7c +DIST linux-5.14.18.tar.xz 120717464 BLAKE2B 8d9b45a0cc8c8e5b21fd07c07d5df718833bc0e01b199e3975b54bcdeabd27e941ebf594e162ca10c034d4dedbe511c7eaf41d7367a737292abbad0730ecf80d SHA512 c35c6ebda708779748d58f1807ae3e97835c6573699285ff92928899010039753d4ec9e93bfbc804253536da0f9132fa60911a8ebd751857b62ec912661297cb DIST linux-5.15.1.tar.sign 989 BLAKE2B 312af6cf75c537117e23146a7f9021d66dfbfd2b2311951f2c676268a68305b255eeb8367963ed6cf1b95a9777b959f7ac334f3a56f95335f4fb0bec40181ca7 SHA512 09a78a12846caeb646cc5c3857e87ce0ab65cf23c0e8ad7299f47b01266edcd86f9fd1bf35e6fb8ead52d039218a68f4de5bc841535e0ddf186fd6a75a5a1534 DIST linux-5.15.1.tar.xz 121902332 BLAKE2B 4285adfbd99fb853f70db73aed2ba68e146645495d8afc060c5ddae21aa67b3a92c09e76c69809693d4b3b7bfe9dc64efa4c7c43044d19fbd66898459a3f8958 SHA512 bfa8f7a4a742038ebf8f9a5b151554e268545543abca1ea1817fffcf388d6a5f3af3dce1c8279824af3938a9155f5a0d547edad334486d0fe78b7bdf3aef78f0 DIST linux-5.15.2.tar.sign 989 BLAKE2B 606b013557b8b6ed0305cc0e50a125c69bfe25c46725ac77660d6985d106b395bd6d1bd2388d34f3be27197df64425aa154260b5a13eb0ec7c167fb11bab68ff SHA512 7ede2846cef69a1c3ee08e37bebc0ecfd2d8b3710d7d573bb3ee61320c17e8f9dd6dacda8cb0fc5e458d5d50fe4a7e2b28d1438db39cd2b426d315a14d342885 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.ebuild new file mode 100644 index 00000000000..f733bbd2a24 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.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.14.14 +CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371 +GENTOO_CONFIG_VER=5.13.4 + +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[@]}" +}