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 0FB8815810F for ; Fri, 9 Jun 2023 18:11:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DC16E08D1; Fri, 9 Jun 2023 18:11:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 553D8E08D1 for ; Fri, 9 Jun 2023 18:11:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 19A353410A2 for ; Fri, 9 Jun 2023 18:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86C75A98 for ; Fri, 9 Jun 2023 18:11:43 +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: <1686334293.b678f4e9694e29501b2ec9abfbd6caf05ea952a3.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.246.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b678f4e9694e29501b2ec9abfbd6caf05ea952a3 X-VCS-Branch: master Date: Fri, 9 Jun 2023 18:11:43 +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: 349737df-cc42-4263-91c6-293b099ddec1 X-Archives-Hash: 9fcd7e03bbac9ee699830f33ecb01f18 commit: b678f4e9694e29501b2ec9abfbd6caf05ea952a3 Author: Michał Górny gentoo org> AuthorDate: Fri Jun 9 14:03:31 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 9 18:11:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b678f4e9 sys-kernel/gentoo-kernel: Bump to 5.4.246 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.4.246.ebuild | 103 +++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 9c54a1a3f298..a95d8bc55cf2 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -14,6 +14,8 @@ DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B a519f23086a440d560e5301b77aa DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682 SHA512 54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91 DIST genpatches-5.4-252.base.tar.xz 5808300 BLAKE2B d5cb4fe312f469a331269eca8604d9c43feca79bc6778af670fad859de3098c31cf0408fb58d95f233564e0ab2eff7a45ad041b8fc6bb97be0f93dd911224b62 SHA512 4970b66f064f53db230877fed6434e39aebb727438465667af6eca8603b712089830789c16bae5fe0249dfed0cb4bdbf1ce695cc7a1ebb6ab64bb61b1b38a5cb DIST genpatches-5.4-252.extras.tar.xz 1812 BLAKE2B 07013e9aa5c8a2380424df700ac7ce592732316b97d6605ffb0e75270b9b08716030a56ae78b9f09b9e314fdd78ab8a8bf986ab767eadfe0a58cf2906be52b17 SHA512 3070acc7127a372f02479f4eee5f465dc3c1fe1ac3b4c2ce0af61d2fe091c509f7e7ef2af8564eb178efe031ac5fbf2f23f48bce4ea54d4500e1b1eaccea6340 +DIST genpatches-5.4-253.base.tar.xz 5855284 BLAKE2B af86d19abc80339eb77bad98df5f404ef5db39584955094c54726d33f6a825c495d835c1f809123903debb2c31c6ad3f07d077978d10c6dafe8170cb60087c7a SHA512 5b9895d2ec8b5080802675912ea8419ed892693f82a4098e997fb3b6ce92844d605a865b31a2f06272248ec2386e36a0e9f74c163ef28e4157f29788c0e7eb5f +DIST genpatches-5.4-253.extras.tar.xz 1816 BLAKE2B 2d3492cefc1abb1b5f35c375afb99892eaab0b90f2b5624560b5dfa4b89bc6eff729ed81737e04e33f78e66b74835a8dee260cca14261c5d2a88644b1b30f8c5 SHA512 31a201024441c55f5477b431aa94a2fe4c98977bb9c1a359af07519b8a204f16189f0595bf71aaddbb88c88e73ef918dc3943bc0a17a2a573cf34dd68dcbb211 DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55 DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26 SHA512 528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild new file mode 100644 index 000000000000..e8d62eeacffa --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild @@ -0,0 +1,103 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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/projg2/gentoo-kernel-config/archive/${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 ~ppc ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +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.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + 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.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[@]}" +}