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 20AD81581FB for ; Fri, 5 Jul 2024 14:46:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 249B72BC0F6; Fri, 5 Jul 2024 14:45:58 +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 03CF52BC0F6 for ; Fri, 5 Jul 2024 14:45:58 +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 D4C0833BDFF for ; Fri, 5 Jul 2024 14:45:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2DEB1DD4 for ; Fri, 5 Jul 2024 14:45:53 +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: <1720190738.7d81055838059c8de4ebdf573be3e18ada00b013.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.97.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7d81055838059c8de4ebdf573be3e18ada00b013 X-VCS-Branch: master Date: Fri, 5 Jul 2024 14:45:53 +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: 4a0a3b72-3fe9-419a-b153-b9a360625913 X-Archives-Hash: 66837e4eba64ef6c013e4b42b7feb100 commit: 7d81055838059c8de4ebdf573be3e18ada00b013 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 5 11:23:12 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 5 14:45:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d810558 sys-kernel/gentoo-kernel: Bump to 6.1.97 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.97.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 1a925c197283..52a8bcf23cbe 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.1-104.base.tar.xz 5452728 BLAKE2B 49a8765789436c1bdb34f72e8652 DIST genpatches-6.1-104.extras.tar.xz 4048 BLAKE2B 526ac16b6ffd987dd4f87797eeaa4ab1d25a8f27fb5b924f13651330abaa2a29bcc4d7d56d5be63b6d8f1c25c8f3205fd51ddbef1b324de89f67731271b24283 SHA512 3fe90150711eec1c4277e6b4cee2599e97edf0902ec7efae1ad836ccfe62233e2c6944f7abc30042e7dd5985ba1f8a986bc3de086739f5a8b64d18c2d7025742 DIST genpatches-6.1-105.base.tar.xz 5482556 BLAKE2B 65a6acbab40206722368b4953749ad24c826cf8792271853092c3dc111197ff13efff6beb25487a3b3c136e564f400b6ae2a0c43826ac1173a0275fa5792e1f5 SHA512 f9ad78ab70feb8ce409d0fd86de797adfe8fd95c794deb388d87664f7f3754daf83590637059904ec4cc06d972d668efbad4ff91a9e86b4fdf04fbfd2c34f438 DIST genpatches-6.1-105.extras.tar.xz 4048 BLAKE2B b5be2421ceb2e112fbc1cdbecc96656653192f37648d643832d9accb08102bb55bbd44051ba941a2fa45de9d73659bad5b328904c4367ca808716f7b6ddc274d SHA512 ca050960b5c56bdc5dc0dcd0d0258293b693b893f38964d0a1ea5ad291a07c410025f162596e7b26935c20a6b151ee387635152f34cde3e8a2109c890181209c +DIST genpatches-6.1-107.base.tar.xz 5516960 BLAKE2B a4c1128db49bc5dec2aad2999279356c5c9578c8a7a1bd30c6896392da116325a81937ded85fd2684f206283a34fa3247af17ede459d33717cea0a58444760ef SHA512 ac371501c5a7e7e1f7ae2325aed969e2bb2788faffae6742f08836eb4495a21646d6875125957703fd2225066eabab9034022cf27a63c026ff02cbfcc9b00f24 +DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B e37572e0575345470b87d07d8e3a0a7e8f7284d9ebb987152232f5a09c54508da833d60982cddce2fe5997e2791866b61a07555f631ea75c130d094bb5ed4925 SHA512 b0f2f6758677b163da436205f7493932aa925854446dfe1f687f829b0ef2d53b371992bf2001b217a0b4ec6c236a99833c98f168b877df45aae6819e39d0598e DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1cd1ecfac87ddaaee1ed3213f36bedbe4441ecfb062abebd1312572971e9cc9e5a0e8d3e16c7af98862b087906d61fb4e1e10 SHA512 6db496702e671459f3b054ce7068bfa48fc3b2be6bd3cbc3b158f7d4e0a2fa2310b875e46d233adea870775358e6e9b4f19fe8940d146575df9a41bfafeb1ded DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91 DIST genpatches-6.6-40.base.tar.xz 2364536 BLAKE2B 53bf04c020921c8d0c2e7ff8466db4cf5078ac8985e95b5b94c5fe9e824747d66344acd5d8675c42364704dc34268cd636fe10bcb02b657cac889ea8d0b4ae48 SHA512 c5852fc2db474fcf697818cec947cfcce0dcff834c57c042c42321889839d94c26d1994dfc275e64e0acba3055c90f0f0cc4e2a07c80a71a71f3ba99f6093401 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.97.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.97.ebuild new file mode 100644 index 000000000000..40d129f75827 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.97.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##*.} + 10 )) +# 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[@]}" +}