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 0BDBC1382C5 for ; Wed, 19 May 2021 18:22:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D4E2E0871; Wed, 19 May 2021 18:22:01 +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 ECFA0E086D for ; Wed, 19 May 2021 18:22:00 +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 CB0CD340CB8 for ; Wed, 19 May 2021 18:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3283B78F for ; Wed, 19 May 2021 18:21:56 +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: <1621448489.a44455a42d401c7b84787f7b325831d70ac02574.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.11.22.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a44455a42d401c7b84787f7b325831d70ac02574 X-VCS-Branch: master Date: Wed, 19 May 2021 18:21:56 +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: ca0393c3-ad9a-4aa5-b489-fef328a9f205 X-Archives-Hash: 752c0c89d9047173f36cc0d8c0b4f791 commit: a44455a42d401c7b84787f7b325831d70ac02574 Author: Michał Górny gentoo org> AuthorDate: Wed May 19 15:17:31 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 19 18:21:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44455a4 sys-kernel/gentoo-kernel: Bump to 5.11.22 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.11.22.ebuild | 90 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 369d0316ad2..d435e4370fd 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -14,6 +14,8 @@ DIST genpatches-5.11-23.base.tar.xz 780560 BLAKE2B 1a825e657879f0d6d6ec51c24ff52 DIST genpatches-5.11-23.extras.tar.xz 1768 BLAKE2B 0dc1b2b6d35024f967f941c2843cba1f32b0dbf98103b8d1d821a6e5f8abfeb7e9a3f0d8ca4b908b646c5211e3918da60f54b07d54b865afdd4d6906a40d4595 SHA512 5bcf298f79673b0731870a52bc8668fcae1d371c9df90488f396b9e4394ca020f7b962bde7af03a862b3973a694289fe32ae28226c90c82967dfa2929d154ce8 DIST genpatches-5.11-24.base.tar.xz 937980 BLAKE2B 834f1acad5385708d36336cc4021a163a07c3e5e9c274cc13bfc011fd99f864134adb3370f712a2e2512677c80b268762e254251189ed46e3bd4081cd83ebf45 SHA512 55d6b28b85d68a9721c3cd8a622df27e76d80ff7a010c273a42d12ff55224f1cec512c8278a5749559e95dbdf2f01bf3d7dbcf7b827f0e2df58e5e08b73ab912 DIST genpatches-5.11-24.extras.tar.xz 1772 BLAKE2B 5fab1d09919373c8c1dd0936c52da0909b577a17f2d386634a033e2c593fbdbcdfe18211171dce80f3d2ce8bbc1604b77a3a9fa99563cd228ee74c154ff472a2 SHA512 65b4033413fdc7ae8b3c0e6a915d21c879b3ecaa5ff2c4e87e2ce890dbaab161d16f41de6a740dd8096d4e215f021de125bc2913f5b711b28fe9985149a80e63 +DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970 +DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec DIST genpatches-5.4-118.base.tar.xz 3359396 BLAKE2B 5617e29367808fd5be4d7cd95bbfa2680f07fcdf0c4b02f3a5750f715a0e728ba3c1cba82254495cf1496a53a174c6209821d57984c0810c7665ce325aad90ee SHA512 496d33188a6fa440cee3997b4367c57f46e398b35799a2f4a349f34f5947884e7c28df56c4990a48ae1c8cf46932bc86c7c1fcc9593ba7e1e786943b55373bf6 DIST genpatches-5.4-118.extras.tar.xz 1772 BLAKE2B 0da077edfd1be718e67ea06824f29b86c645597be80c9b7fd99fbab25b1638bb3e95d2a0ba3b0c6c31beddee7d6dd3fcc89c640139ff787ecdff1e7d0b5eff72 SHA512 9b99f9f6ae84f10db1dc3b75df6c4d095e6624286bd1de888efe3d063e06c9ff44dd51f18ed4d153c935ec6be48d045f8286db1a49ead4abe120e20620ac2307 DIST genpatches-5.4-120.base.tar.xz 3365276 BLAKE2B d72fc4839a6716278fa6144c4ec33ac24dfe1689734699fbf9da96f9ca0c91630c79cc31df3e86d8661ea8cb4ed7295a31a56c6da097b2643c35a0391f8aebbf SHA512 a84f804aa8287c90e23693e8eb518b041bba05f3fbb1f3bcd2f9e120c758b871e3926ab73cfe1a2363488000d4ece206b95ea73726be0900172060b8a358a855 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild new file mode 100644 index 00000000000..ec094664a50 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild @@ -0,0 +1,90 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.11.21 +CONFIG_HASH=8b43a43382cabcf6d64266565ccc052c6e5d58a6 +GENTOO_CONFIG_VER=5.10.32 + +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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/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" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +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 + + echo 'CONFIG_LOCALVERSION="-gentoo-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[@]}" +}