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 A3CCC139348 for ; Tue, 20 Jul 2021 09:08:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89FC8E0B34; Tue, 20 Jul 2021 09:08:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5B149E0B30 for ; Tue, 20 Jul 2021 09:08:53 +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 03EA5340806 for ; Tue, 20 Jul 2021 09:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 535407E3 for ; Tue, 20 Jul 2021 09:08:49 +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: <1626772107.1c3525b967b1defd1222b14697d18d6ef221a51e.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.4.133.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1c3525b967b1defd1222b14697d18d6ef221a51e X-VCS-Branch: master Date: Tue, 20 Jul 2021 09:08:49 +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: 0788519b-b55b-4713-8db1-6b727a665ce0 X-Archives-Hash: 394fa6c13e45b946165e80fab497b8a7 commit: 1c3525b967b1defd1222b14697d18d6ef221a51e Author: Michał Górny gentoo org> AuthorDate: Tue Jul 20 05:00:36 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 20 09:08:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3525b9 sys-kernel/gentoo-kernel: Bump to 5.4.133 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.4.133.ebuild | 97 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 64dc09d4416..78e6c35cf01 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -26,6 +26,8 @@ DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696b DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77 DIST genpatches-5.4-136.base.tar.xz 3704860 BLAKE2B bbecfa854caf388d59da60c37b555090e323fd7117db68e4bf9cb84ec8605a286c7a1e0fff02622043b7884f4e57ff5f0cd18f7cbc70736eb04b08a2cd7d5aa4 SHA512 e8b3883e06f0fe00e598dd36911697cbe8e938f7664d9c8b8625921e7720ee50b8ec0ba159d0f50488357ec2baed0e640cdb7fd5d2a2f26dffa3a76640b40871 DIST genpatches-5.4-136.extras.tar.xz 1772 BLAKE2B 956980231960a32019c0ef8fe608f58b7caa291fb5e9f06f1f9435111aeba9c89fc14f028247bc97218022c2393cf16faf4b94e1b32f5b7be263b263bf69cb45 SHA512 007b267166f1e0481ab1ad3172492fd1f7929e1387f230ed24177e7564c4319b8d3f7c7e075942d4340ba19a9889fbcfd580ee335025314cf13a3cb9ff42886e +DIST genpatches-5.4-137.base.tar.xz 3732352 BLAKE2B d3f8eb230d10f5b6727911476a730c311028d9f3e80b027c0ed44383d52a69f2ef2aa2dbb8e50883533a8f2b3edf953e107248c6eefb697d3612c479e50966de SHA512 a045449fc6529d4e74c83ed2176c9c9795de0833e8b76d4e217eaf6bdebeb0948c46b72797da4b259c2bd579c33e26443e125a9fe2102ec08c804de6daf9a608 +DIST genpatches-5.4-137.extras.tar.xz 1768 BLAKE2B 7b3a0a74410da44512e0a1296045af29ebab3276b22db770c223530043068e43284b2ee5417f5dd75ca799a84916e3942ffb90c07e4bb389fdc5a4e6897b37e8 SHA512 9f354fdfafe26ae5ff0a13ce5d3c47c951a98e506fe57253656dcc4e8e4ff5235532400e5011d3d1c71d14b8f663fba2f20abffcfb7eef8849c3d6bd847701a6 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.133.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.133.ebuild new file mode 100644 index 00000000000..1bf22439675 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.133.ebuild @@ -0,0 +1,97 @@ +# 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##*.} + 4 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=5.4.114 + +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.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +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.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.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 + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +}