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 8BA361581F0 for ; Thu, 09 Jan 2025 20:06:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 998C1E0784; Thu, 09 Jan 2025 20:06:02 +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 7FE86E077F for ; Thu, 09 Jan 2025 20:06:02 +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 B841F33BF39 for ; Thu, 09 Jan 2025 20:06:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2AB51DE6 for ; Thu, 09 Jan 2025 20:05:58 +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: <1736453145.f6b76a2b4022c90634a5fe9a4d1da608c35e2ca6.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.124.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f6b76a2b4022c90634a5fe9a4d1da608c35e2ca6 X-VCS-Branch: master Date: Thu, 09 Jan 2025 20:05:58 +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: b4ebf6ed-138a-493b-ad4d-f9e193053ad8 X-Archives-Hash: d1c2f2bee977defe7c81eabc68ded685 commit: f6b76a2b4022c90634a5fe9a4d1da608c35e2ca6 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 9 14:20:59 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 9 20:05:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b76a2b sys-kernel/gentoo-kernel: Bump to 6.1.124 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.124.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 37e3fa1a4cfe..d4774300ed59 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -12,6 +12,8 @@ DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 3a1d86ff100ded252a1af8cb1cbe DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f SHA512 ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66 DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f SHA512 10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc SHA512 e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d +DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b8c0e9f9d5ca3db44d5fc6c392bf34c022fd6ba9022734aba45fdd432673133e9f4f9ade495658550a68ad537153a08cd01af SHA512 214e8b20b52af4fb5b22035955dbafe665245c3ca85a1dab3419385be6f9f0d3b0f5d0ece9180c71a11c9e11b1c69153e82be282b46b41c1eba2df19226f90ea +DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8c48dab78783e4d144eaf2e798fd0f1fe1e192138dea1802fa7a17385c6ca65ddf9b089cc3e547ca23efa36bda45cf355f5e SHA512 33e35c97ba7017e0b8c78f53aa4ab91e57c0a1f1fc246fec6ba6c3a091577bda2f99ecb1d909f3599d9123f2d99e756b7b6bb5b8086c8ff4cefc28a1827e5410 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633 SHA512 f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147 DIST genpatches-6.12-10.experimental.tar.xz 78160 BLAKE2B d145325c0a3bbdc93b1e7ed86f860576192aa7260cea083508efc581257cfeced92f390c398299adb1c989a513c15a5252e79e9e05737eabb89a98cbda9f5d91 SHA512 5b3b355fbf2109d83104f92486df4ad3881f1a78b3dada8285e195486def7d1668c55c797460504647e43d5a8f4fbaac7523e9c4745387c314fd1a8410083c5c DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.124.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.124.ebuild new file mode 100644 index 000000000000..1009a9df0132 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.124.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2025 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=g15 + +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[@]}" +}