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 E52711581D3 for ; Fri, 17 May 2024 16:21:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF377E2B0A; Fri, 17 May 2024 16:21:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 754EAE2B0B for ; Fri, 17 May 2024 16:21:24 +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 8893A33BEEE for ; Fri, 17 May 2024 16:21:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C22AC1AE0 for ; Fri, 17 May 2024 16:21:20 +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: <1715962866.63ec0f47f301315ffdc0b030c5506dfefb2a9caa.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.91.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 63ec0f47f301315ffdc0b030c5506dfefb2a9caa X-VCS-Branch: master Date: Fri, 17 May 2024 16:21:20 +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: bae17699-29c0-43c8-a9da-2d98ca9084b4 X-Archives-Hash: bc9f3524be72013a787e185c810c2750 commit: 63ec0f47f301315ffdc0b030c5506dfefb2a9caa Author: Michał Górny gentoo org> AuthorDate: Fri May 17 12:33:35 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 17 16:21:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ec0f47 sys-kernel/gentoo-kernel: Bump to 6.1.91 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.91.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 159fc111de60..0f94ba64666c 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.15-168.base.tar.xz 6757748 BLAKE2B 32b6ebb14ed20864b51fef7cf5e DIST genpatches-5.15-168.extras.tar.xz 3972 BLAKE2B 6cde986105f72e9282c78f59c8bb82bd3ac7c5c03adb3b3c1c657204624df2a28048ac0fe095759d5906bcd6677831d9962894b76390c2861482440120e72fe5 SHA512 6e067603b8e0e318703a59347d38d7aeb44a3097c39df07881c0f5250207b05442053a8ddf32069ead729ab4c36ccc1177ee8d82417ae2dbe16014b221d0d1ad DIST genpatches-5.15-169.base.tar.xz 6804132 BLAKE2B 4c1bbb7881dc2fe1a15fb2baa3535b33d83421f029612567382d624afdf0e83bfcbcd34676f63c9d24cd5e91dca2e67b88b2d843ad8167bb0a423bb0de268a4b SHA512 abb6870976a156e548800e45cdff3b4aa4db723f4b6866dbfb3b6437707990d74bad4f0ca916b0e313350c8bcfeff13542089f102fc99cc3eb899349cecca7be DIST genpatches-5.15-169.extras.tar.xz 4048 BLAKE2B 422d0230026956391a9493a7363a6099b07ff5e16799a4ef194a177b2fc84c1db666e3cc326e5648052a0a76a87367fc94dde8cc8307ac36c412c0ad85d0d370 SHA512 287ce1ffecb61297c55465b223d8fb86a84ca4805856fcdb605fd43ed81b579aaa64f696d4a2687a95c312ea285e05ccea8a3589c911f99dd4628609155c7422 +DIST genpatches-6.1-100.base.tar.xz 5230656 BLAKE2B ce1e60a36233dfb26eefad5351fb71d8374fb673fc117fbf37ced214f678c642c0fe0e898d6136fdc99504c3b1ba094c372143fa94bca87efe0a63c184256229 SHA512 ae3ca97ba86715c0a6b9a4888c7b5b262becbbf5262e868e171e9738f212701855f2a1e6587908e5008f524b546d3fcc9f0c671286e5868d67edaf3a92a141cb +DIST genpatches-6.1-100.extras.tar.xz 4048 BLAKE2B f8266ea5ef27224671f17cce493a10c02a0b93e4b904b608ec9953e7fdde42f0e89419d7d32f926a400bdda952aa87be2d9c66896e6fb120fdcd92b6473d5ddd SHA512 c044c5fe35ce29113d127b0ff34004d7125d45433ddbb3943549d0eae657a177a1bf037291c151b2ba3a9d35a89663031afa11f0bfd114531aa5bc54894cbb99 DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a SHA512 39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e SHA512 e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.91.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.91.ebuild new file mode 100644 index 000000000000..05e46adc1bda --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.91.ebuild @@ -0,0 +1,146 @@ +# 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##*.} + 9 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g13 + +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 + 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 + biendian=true + ;; + hppa) + return + ;; + 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 + ;; + riscv) + return + ;; + sparc) + return + ;; + 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[@]}" +}