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 AF62A15813A for ; Thu, 09 Jan 2025 20:06:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F962E079C; Thu, 09 Jan 2025 20:06:03 +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 27F5FE079C for ; Thu, 09 Jan 2025 20:06:03 +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 D817534069F 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 37A4C1DF4 for ; Thu, 09 Jan 2025 20:05:59 +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: <1736453147.72bdcf1c5a2ef8147109260d404dc2ce35cfe38b.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.6.70.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 72bdcf1c5a2ef8147109260d404dc2ce35cfe38b X-VCS-Branch: master Date: Thu, 09 Jan 2025 20:05:59 +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: 75f6a9a2-78e2-42a9-a7c4-506d33ab8132 X-Archives-Hash: d9f4712845026d52d109131c737bfbbe commit: 72bdcf1c5a2ef8147109260d404dc2ce35cfe38b Author: Michał Górny gentoo org> AuthorDate: Thu Jan 9 14:22:42 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 9 20:05:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72bdcf1c sys-kernel/gentoo-kernel: Bump to 6.6.70 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 3 + .../gentoo-kernel/gentoo-kernel-6.6.70.ebuild | 144 +++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index d4774300ed59..4c0c165cdf32 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -32,6 +32,9 @@ DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1 DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B 24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939 SHA512 306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271 DIST genpatches-6.6-78.experimental.tar.xz 5764 BLAKE2B 2175d1d16800d10c6d6032e42939c3402784fc698d8ca98e4671d62da98da5df38a4133451e2ce8076514eb9f4ffde2091832555430fd3f40798b04c1565473e SHA512 bc5f64b738f6becdabe5e50ee5d82f66aa58e5c755d3987018036bcf45679877cc206c3bfa326d74a88916fa26be68ffa56e12fea186f46a26369f51db465830 DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B 464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f SHA512 71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9 +DIST genpatches-6.6-79.base.tar.xz 4222900 BLAKE2B bcd3e23877b7ee2439eb080d304a346c539b2ea2a3b242b89cfd68dec8f3022d2e89b43c939ae11c02d60c93f3c0c7c6569fc41994a8faa3a1fc259d4065bbcf SHA512 a336717d2f9585ddfef9ed6c373d7225bce4c5a76a31d55bbf8998214b1a835435a7510ed5b4cd4aafb4f92e668f7646e0f7ca964bb1505b4bd20f8353f46761 +DIST genpatches-6.6-79.experimental.tar.xz 5760 BLAKE2B 07c668a2025b67cd2c231b63525e98ea269861ab035b9ef85041ebd20be8980159522f0f615bf46f86535e329f3e5f91930d22827a01cb0c86a1f40d45e2b32e SHA512 dced1b5f30e8ed72b546fa8b047caa60891b8df917999a65da1f98a0ebbf008dff6c12d5b9e7f45efc5857d23851a13a68cde4b688f4b520e08bfeb7ddc2165c +DIST genpatches-6.6-79.extras.tar.xz 4056 BLAKE2B 70ffc39672faf32971e8b3bf8e41fe2a24e65fb3268447b1c9278fef4cf9fd97ddf9045329ad1431482e6628af911733bf86c7ba7cab624880cc070e68d94f39 SHA512 c3403d427b07a3b70447143d728987ea995b0d3d4d79c1d3a874c3de34cc5c14068320847628de36dbb40cbe63540942969cf2b158b0a563dc34aba927e3ec5b DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502 DIST gentoo-kernel-config-g15.tar.gz 5746 BLAKE2B 2baef40e18cbf3bb975362d71ad674604ad80338d1e6914ffa2fc03af26f1b9c9cec66d39a56077693a7327060bc29bd5eb5787549857dd3779e841192cb2016 SHA512 45d609ee25a529988868b8c99c808f4e6abbde34ae501bf35523431ee85c9f3657663d6f938f2036a5f012a55a68965b32fd41fc44d8f6ca606a6fd38f952445 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild new file mode 100644 index 000000000000..3cd7741b4cb3 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild @@ -0,0 +1,144 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +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.6.12-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 + experimental? ( + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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} + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug experimental 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 | loong | 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}