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 37513158041 for ; Wed, 8 Sep 2021 17:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59504E0951; Wed, 8 Sep 2021 17:27:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 2601AE0948 for ; Wed, 8 Sep 2021 17:27:45 +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 15457335CF7 for ; Wed, 8 Sep 2021 17:27:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42923C0 for ; Wed, 8 Sep 2021 17:27:41 +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: <1631122016.bc8f02c3566916e285048b65291d3949a8e564df.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-5.10.63.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bc8f02c3566916e285048b65291d3949a8e564df X-VCS-Branch: master Date: Wed, 8 Sep 2021 17:27:41 +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: 21d3e375-cbf7-4ed0-b2f0-3d75f5c055e5 X-Archives-Hash: bf6507f3bab85bbb173271e68e961571 commit: bc8f02c3566916e285048b65291d3949a8e564df Author: Michał Górny gentoo org> AuthorDate: Wed Sep 8 16:21:56 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 8 17:26:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8f02c3 sys-kernel/gentoo-kernel: Bump to 5.10.63 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.63.ebuild | 105 +++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 67b17c453f3..2bfab7f6c1a 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.10-67.base.tar.xz 2086184 BLAKE2B d01856f8ab1b24b9581576c80c63 DIST genpatches-5.10-67.extras.tar.xz 3848 BLAKE2B 1469349ac07374c4f6e8875757e588af6d78d13fa8162573ee83a201ee5158916043d013bf1202d89911584fe861d0a7ab264b63affdfd062bb23cf3e0011869 SHA512 7887ce5a472f6a778f3eaa4032f5a9ba2dac8f06dff1937188c708396f2305a499ed129e275e85aafc6746e7bbf4526cc7aefe502bcf4953c30020cbb0e9d657 DIST genpatches-5.10-68.base.tar.xz 2112828 BLAKE2B 6d6da1488df427a6c1530c0e855ed8ef91d1847d090b1a853eec9a8e88cdc0d95fb77284c7f443679d97e3fb980e790f42a381696e4d30687c03e2fb1074dbc8 SHA512 36980210f02a5370402ce9a3a2858af58b0cb0c818a433f1a7f36308511ec96114c83617f508d96e18d9922a3ff782ebb11069f7a07394b0c2710c3403d58f94 DIST genpatches-5.10-68.extras.tar.xz 3848 BLAKE2B 90869f9c59d7f73af938c4aa0983095f4eb03058f53b71a3499f1829ed2fc227fb162d80b0d9add62a9a2b7a350226a55fb7aa884d2a0e7c3c63ac94891bded9 SHA512 18e41fdf3a4452eaea54fa832534cf5efb6af5bee852e67a664407c6cb4953f81b33870bf24d9450f92ca824548e53c67c57d938dc9c675aba8f2b18ddf736d3 +DIST genpatches-5.10-69.base.tar.xz 2119352 BLAKE2B 5c861ffe65077143e0778ece1334c90e9b68b432fbabae79cd9821f9b3b237c7de5964441b34c1fc58a93f980d801db6e85c76428a760c2ab83817dbb28bb61a SHA512 54f1e20cb7ab890f77ab29674688746fe1bc1953113ee4bdd850d35aa656b9088ce10e33ebdf7742f9016e5ccab8cfd4eb951e2bd77c5a356b155b9d42d35253 +DIST genpatches-5.10-69.extras.tar.xz 3852 BLAKE2B b950a181ccd370fd35bb350f3f9ad7d1ffd7b6b9d4d0ef2cd3c0cc9bcccf663915bd7f155d47f2c083ca929b0c741075f4d4c5efb8dc3550b9e197eef57ae28d SHA512 49b3d652d4ed9d074c316ac41fc6afd5df60edde44bf8999cb4dea7283992d056fe3824eb16a9d7881a8a058198dcfbbf6aae65ce34d051e1f55f4cf2324c178 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B fa70753d96944bfe43ae352592be5fea8b8bccbac1f7412a241d951b5009e4643e12123ec3aa6864b9a884fffc744c8ec0be84dd499a29dcbf3c36446b013842 SHA512 814b3766c5330b5890e63ab47399e91981c18dccda37797983076ec860e8d2056f112706a07acd1f5c0f72a5417a8713d928b473695f6669fe734de025048015 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.63.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.63.ebuild new file mode 100644 index 00000000000..104eaa4eafe --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.63.ebuild @@ -0,0 +1,105 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=5.10.42 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + 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 hardened" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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 + + local myversion="-gentoo-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 + kernel-build_merge_configs "${merge_configs[@]}" +}