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 BE84F158043 for ; Wed, 8 Sep 2021 17:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD548E0916; Wed, 8 Sep 2021 17:27:44 +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 110BCE091D for ; Wed, 8 Sep 2021 17:27:44 +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 8C528342ACB for ; Wed, 8 Sep 2021 17:27:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E887FA2 for ; Wed, 8 Sep 2021 17:27:40 +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: <1631122010.b6bde9574be301a98d87f40d8df18dadfdaf45e8.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.13.15.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b6bde9574be301a98d87f40d8df18dadfdaf45e8 X-VCS-Branch: master Date: Wed, 8 Sep 2021 17:27:40 +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: eb68969f-e466-4ef2-a256-311fbdba1a9e X-Archives-Hash: b4e2e1b58e25c77ae8efca5c7fd6699f commit: b6bde9574be301a98d87f40d8df18dadfdaf45e8 Author: Michał Górny gentoo org> AuthorDate: Wed Sep 8 15:15:52 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 8 17:26:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bde957 sys-kernel/gentoo-kernel: Bump to 5.13.15 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.13.15.ebuild | 105 +++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 5f014bebbf6..67b17c453f3 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,6 +10,8 @@ DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B fa70753d96944bfe43ae352592be5 DIST genpatches-5.13-15.extras.tar.xz 3852 BLAKE2B 17c24bda81640a2431729cafef4e6401902390a57bd41ee691e971fadd54761a8829a559d201d46f883bcf99fe9ea34509fc7a95ea90ad3fddbda732878bc278 SHA512 4113f3e6ced039f6aeb89a8033d88140a993ebe1bc99d7dd2424f90846e217398551bbdf67ca199acf42b9af5aeb8a144e84bacdfd444f170f1a0a747fb1c477 DIST genpatches-5.13-16.base.tar.xz 742200 BLAKE2B 91461e451c99801a22ea8bbd98474b990a984d82ed36493878c68c7ed4caa1ea24ae329ee5e8a08d3fb7e5fd67f817351b47efd16940a803d8304ef7aa5034fd SHA512 ff66efffe36ea0ee32577a5ac78e902ce7e3b9df1bab6333431dbb0e6735461600f605707666de41618de4d8c6b7a8cd1dbb24e6c74f656d4be9a7be72ee96ed DIST genpatches-5.13-16.extras.tar.xz 3848 BLAKE2B ec963b7d96ed03f430855aed832cbf2757d14cb6f4d364e4f100a521d2a8415b588215f1fc00afac19744c6afe6d0f4f8a4992e78cf0733a74f0c34251c9e6c5 SHA512 77285bbe43703a0a5ae5dcf37a08294d377ec594fb4248bd23afe68e8be471fa833d5a8db77d0a9800ce9b570b7dd98957fa61c676c8f5e6ea95e28b27dae2c0 +DIST genpatches-5.13-17.base.tar.xz 746560 BLAKE2B 6a34e85e1c866859df8850487cd5d3cf431f0577e4e2844296a932a4ca8058c50a00dcf1d52c85db786e2d0eb3a5379203725fbae3d89f214b526e86eba868ad SHA512 975be7b38f448303e5d32283afe64374099833efb56c38472641b32dc21aec4f4b2ca8084e9c9d0e9c566fa3e73629d6165c27facaa740dbfd77631f3639b14a +DIST genpatches-5.13-17.extras.tar.xz 3852 BLAKE2B e68187eb92f6f96affc059e7a0ae80481a98b22d8954b40f72e8e51c4f3f86a6dcd54ec7b97d23f381f4391dc1abc56c07b81e5faf1291e7b49dbe6170c4d2bd SHA512 257920ec44c4e03c37b5e2fa77a1559545bc721dac89e0d792dee27c6747f008d6cba8eb5ff45d78c3221eb128e899139ab913c472af1cbb21bc9e76cef29925 DIST genpatches-5.4-146.base.tar.xz 3857908 BLAKE2B fe3119842aeb3f1f8ba9af26d4db1773380400397b132235db8071c9c05d395502c8fb08cc690842cbde5c5fc8dd5fa456218d2f95434ca84422c6398889cb03 SHA512 d293600dbcc8ad83641d4866e4998b1b4fa3bb254bca9e0aabd4d94bdf6270b7757f69874e754a38afb8426e91a4072e5c135e12c2a597008cef77f6fd74b7dd DIST genpatches-5.4-146.extras.tar.xz 1784 BLAKE2B e3b75e9f8f29bcf441dececc62a46cd5db846859bb9fb01462846333dfb42f35c559b5b6533035b891062de619dac678b9467fd0432423bcd8505385c0beae47 SHA512 0923ebf0da182eef762653b282fad6d50862c3d520ee1888bf8fb2257b96bb4cb06a3e88ec0b6a8587f17c97f9660ffbaf4695eb0d0d0f46fb59861b49949e35 DIST genpatches-5.4-147.base.tar.xz 3875304 BLAKE2B 98cc4815b004967ef7a00b2b8af96cf002c09b22d54222e0f932e1ef83731846011bb3c4b8f972c85aeb086b0bcd6a0ce0f2ed390dd5f0225b137b33bb2255bf SHA512 999f5e9a99cf8dea0c8da91b0e365703064620b04bcc48909d89af73f551a0da3785201b4a4fd0edfd184872f81109dbb78ca57d95d1c2759a1cac111fe1066d diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.15.ebuild new file mode 100644 index 00000000000..9a47c7c61bf --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.15.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##*.} + 2 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.13.9 +CONFIG_HASH=eb52b35e8cb097413357b578903bd18eb76051c0 +GENTOO_CONFIG_VER=5.13.4 + +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[@]}" +}