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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28E8D158042 for ; Fri, 1 Nov 2024 15:23:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56FE2E088F; Fri, 1 Nov 2024 15:23:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 3A286E0887 for ; Fri, 1 Nov 2024 15:23:45 +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 4F775342FF5 for ; Fri, 1 Nov 2024 15:23:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CE2B1F41 for ; Fri, 1 Nov 2024 15:23: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: <1730474602.da4a6437394349969b1db7638c2c7b88c744c1f0.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-6.1.115.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: da4a6437394349969b1db7638c2c7b88c744c1f0 X-VCS-Branch: master Date: Fri, 1 Nov 2024 15:23: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: 05b28929-852c-470e-b8d9-cf86a2eb87e1 X-Archives-Hash: 325fb91da111213cae202ab1c8d29280 commit: da4a6437394349969b1db7638c2c7b88c744c1f0 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 11:38:30 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Nov 1 15:23:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4a6437 sys-kernel/gentoo-kernel: Bump to 6.1.115 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.115.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 51d4f93a05f9..f1941ae0a8ab 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -12,6 +12,8 @@ DIST genpatches-6.1-123.base.tar.xz 6330844 BLAKE2B 7095b2e44e1dc34e38d017255057 DIST genpatches-6.1-123.extras.tar.xz 4056 BLAKE2B 13343aefa58e0c36894a31f45ece3e90686c478b7955854d458a358f30f5fe1a058ee4050aae883e31478d47ae8d63c566bdc032e3cf998af7c3c2c5f8529ce0 SHA512 2bf039625947f5120cd457639f223297ce7b073b3c8650503a994a944507d4283f9873929412da80d0c0f5252bfab885c7b52f48308443fe809900f43e1b980a DIST genpatches-6.1-124.base.tar.xz 6355616 BLAKE2B 8b912dfa6afd71b8d2cfd709aefb7acd2df66e7806e19440db7ca74a6dc2fe13b2bc55b332aa1b4aef5c84bf64929a20cbbf1da5a30803999986762327eb56ed SHA512 1288c21d553220dc27e28ae533f003d07de5442ffa85bf06cf533266b3a16549239f389d61c7458b3f442f8902bdf4e429f2a17b89bacfe8632fd38147f97923 DIST genpatches-6.1-124.extras.tar.xz 4060 BLAKE2B 326344cb6b4df76db97f5666085d26a8907769b81bbd1016219f319b713c5d2e467c0c0641b1cf5bf7eea80c7d865544a1b6e77b432e002dc768f633d70c9941 SHA512 a440486dbce9c6b291a202200089b03669bcb7c5fd635350f4f2d8eea21d67c073ee7feeca95e62fe96673dd67c92632955a83e003cc49865aef6b84f67dbf48 +DIST genpatches-6.1-125.base.tar.xz 6398228 BLAKE2B d22a9c9792cd0118b14cb75e37ccd526ca83840ba6f67c6cf1a0d8354094092cc1fa1c089634a5d60f6170e46183cafbc58943bb6c09d7a8eca6b44ff08f412e SHA512 5d82330540e9919e3339fb26431f787ca338550dcf85c5a91e573d4e3197eb9999fd653673d60a453306930e2126ee375faae67f4a7ceee7bef8af48500f91a0 +DIST genpatches-6.1-125.extras.tar.xz 4060 BLAKE2B e3e479543a260ed1c7caf3d7faa8ce19b88a6f0f84e05b5ec306da5bc118e540d4fb7fe43a8240659b52d929f32ecd50d030280d4848be034c370d5d22adbbb4 SHA512 cca2043706427395dc7a70b92f102993ea1c9505820523486f3a57de718bd3fc4f94acd43b8c4bc4103e37fb5d341d61bc028381b589e021c894977dd8473ba8 DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B c9e98632ebd2e74f59dfee66d13f9e4cb515d87fd5f6db946aa577e6fab49251b6d374cb1cafb66b2139a8b75c683ed58557745c8f17e18b14f7bbb417579fcb SHA512 a53eab3075e55c7a7ab82f99fa853f08b054ed0fc95d9008b17b5571e370ffaa53b87662bacec8a4f5309309e89df1282f6b5747df595c8617fdde74c1222cfb DIST genpatches-6.11-5.experimental.tar.xz 5764 BLAKE2B 10018afb311844639407ed352c0c070944cd951948ceb9bdc9a6243e2f8caf302bc8932889541c0303e09884766b6ae96f59c13d653b5bac79bfbc9ab0a8d97b SHA512 c260bc5480b9c3df5958ca859caba618eb9c223fcc165d7de5f11cddb5f06f83b71c7e305b3d84df1061a2750a07d23d75228f287974f4bc8999c898f3284d1c DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c SHA512 3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.115.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.115.ebuild new file mode 100644 index 000000000000..53a3f59c340b --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.115.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.102-gentoo +GENTOO_CONFIG_VER=g14 + +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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( 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 + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + arm | hppa | riscv | sparc) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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 + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +}