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.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 DFD99158087 for ; Thu, 20 Jan 2022 16:12:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A6F5E07E0; Thu, 20 Jan 2022 16:12:06 +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 9A09EE07DF for ; Thu, 20 Jan 2022 16:12:03 +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 C4D34342DAC for ; Thu, 20 Jan 2022 16:12:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42B6B263 for ; Thu, 20 Jan 2022 16:12:00 +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: <1642695107.c19ce9f0d2a864ccce1c3f31cf3917faaa26ce07.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.93.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c19ce9f0d2a864ccce1c3f31cf3917faaa26ce07 X-VCS-Branch: master Date: Thu, 20 Jan 2022 16:12:00 +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: 582a6302-edf2-45d9-afe1-a6a7a4762c42 X-Archives-Hash: eedb16453fa21c795bb233d5518337d3 commit: c19ce9f0d2a864ccce1c3f31cf3917faaa26ce07 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 20 13:37:37 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 20 16:11:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19ce9f0 sys-kernel/vanilla-kernel: Bump to 5.10.93 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.93.ebuild | 130 +++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 5c7a1f182ee1..940b7bbc9664 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,6 +31,8 @@ DIST linux-5.10.91.tar.sign 991 BLAKE2B 6b649151e0bfd3774ba37451eeab2923137e152d DIST linux-5.10.91.tar.xz 115074200 BLAKE2B 933d76a40a908733bdbbba17f06e346695d02bc281c715ca53a3a2d8a25b0f629f82b31962d631b19838d8e76e1634966c5631c904e791b6cedcfb0cb0b7d454 SHA512 11462ff6d874432f685cba8822132bfda6f5bb44f6c20125ecd601bfdc21cd28c263a441abd60beabb90e8e82364cad0499e6120e5ceac4433cdc6dfdd823fdd DIST linux-5.10.92.tar.sign 991 BLAKE2B 5bd4f8c89ea3659ed70aa60d2fbac3f86c23f949a03df3cf650c6f44c373d7b3500b246e20ede55b7bbbf75e9796c5d70a52c8687f321158242617704d1ce51c SHA512 3421adf5d28a877f8cd8e8a820252d757f28a911241517cb8831ce3f4d3e936abc850e3ea94792698b2dc94120b5a87e6367de941d23d92fe6ea233fe02db6e0 DIST linux-5.10.92.tar.xz 120366172 BLAKE2B 81ded0d05dea5b9f3cf115c6694006dad7863435b0ca84f1d4f53172ba8dd9ac4524a2e6025e683e98ee728e726251b266432f8bfb0d096a9f593558a18a0a18 SHA512 57a6c4818a072426e01d666446e0671ac610486bb2790e8a52c825b5fdb059923e4931a3d11d64bbacb562c1f552e465a5569aec5404afb8ab11521dd6ad7093 +DIST linux-5.10.93.tar.sign 991 BLAKE2B 99714d74793b5012c4e2767d796655002b31098b5e7c3c06c125030496f6586955b08fcfcf2ed58219a7e2862eaf25f44a751fd9baf42f60874acb775fe669c0 SHA512 cd29eaac1f172913ed47e45741cfd246b23fcf21613a842d617261a3eeaf57f05fac9402e85c0e69eb42bd091ec795c2b2892adc79a63de49c8cd9bbe8dc7c6a +DIST linux-5.10.93.tar.xz 120342268 BLAKE2B a174f9513127835a0753cde0f26d14a929563f703a8ba2343e1b09dc3089d96b85680c9d7f49e2d3860241ce3e258a0443c861f143813709987378bea6d438ba SHA512 a152188e394258d0694e7e47a05a109068492d985251f468f2b883881f1234f3fb269c9d5935e3299c7cc2bfb66cc7948e5d36f69700049580d4f9cf4ff1cc94 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87 DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.93.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.93.ebuild new file mode 100644 index 000000000000..54ba5f449c7a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.93.ebuild @@ -0,0 +1,130 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs 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.15.5 + +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 ~ppc ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/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 + + local biendian=false + + # 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 + biendian=true + ;; + ppc) + # assume powermac/powerbook defconfig + # we still package.use.force savedconfig + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-dist" + use hardened && myversion+="-hardened" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + if use hardened; then + merge_configs+=( "${dist_conf_path}"/hardened-base.config ) + + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) + + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) + fi + fi + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +}