From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 8B9181581EE for ; Sat, 29 Mar 2025 14:04:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 77215343104 for ; Sat, 29 Mar 2025 14:04:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0B11C1104B5; Sat, 29 Mar 2025 14:04:26 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 02A281104B5 for ; Sat, 29 Mar 2025 14:04:25 +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 AA8D03430F1 for ; Sat, 29 Mar 2025 14:04:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 431C12865 for ; Sat, 29 Mar 2025 14:04:24 +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: <1743257050.6fd603fa9f15f2a1ec6599b743565631f648d94d.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.85.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6fd603fa9f15f2a1ec6599b743565631f648d94d X-VCS-Branch: master Date: Sat, 29 Mar 2025 14:04:24 +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: fafe91c3-d10d-4332-8fdc-3f28860637a5 X-Archives-Hash: 05ca27a214ac6589ab3b534a426cd001 commit: 6fd603fa9f15f2a1ec6599b743565631f648d94d Author: Michał Górny gentoo org> AuthorDate: Sat Mar 29 10:54:45 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 29 14:04:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd603fa sys-kernel/gentoo-kernel: Bump to 6.6.85 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 3 + .../gentoo-kernel/gentoo-kernel-6.6.85.ebuild | 144 +++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index e343b9641e55..1195794f4c65 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -62,6 +62,9 @@ DIST genpatches-6.6-92.extras.tar.xz 4056 BLAKE2B 39db4511a3cae61ec10cdf708852b4 DIST genpatches-6.6-93.base.tar.xz 4705028 BLAKE2B 1beec486187b8504bb6a1c3fe4ce56089344a473d815bc5b33d3af360eb35e56737361dd2eb6e9a97f779fa6027798e3849dc99f0280bb9b9f11da3f8624870a SHA512 7014949210531946bd9daabcf0bda3e1c6f61a2d9c2f9534ae662d529c5ea61b838ea6634afc1473724d93d8801a9e5571549c25f04d72966b0856fe53f35ae4 DIST genpatches-6.6-93.experimental.tar.xz 6052 BLAKE2B fc2a75d9a8f19f49452e16346ac0d6b534da96a650b6e7f653869e533304b65452c0b39bf3eef729ff7614ab8886e8fa20cef88a44abeb386d1468cadbeb8df9 SHA512 294c792f6d4dc76340bd0eb43983c8c9c0167da5366ec8a37f2a91a2d410a9264fbec6b99f76ff67f1c587ba788b32f12019f3661a10e78141924500966e047d DIST genpatches-6.6-93.extras.tar.xz 4056 BLAKE2B 70a19a3f034d0851fa9969029fa4fec74aaac51308b85599a58eb3d2bd15d6b19c95b402bbab1189daeacd28c465bb5381a8ea85bba42f9f66a94c7a1809a15c SHA512 3bd068e5448cf43599708d4aa73d496b2cffc0761144071392f182c79d385d5ab402cd45e0699842f8221072a4cdf505d7f81e295fe0c30cd4d6ea7822d9b6e9 +DIST genpatches-6.6-94.base.tar.xz 4728588 BLAKE2B 63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53 SHA512 9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b +DIST genpatches-6.6-94.experimental.tar.xz 6052 BLAKE2B da14ea5496619cd6e488e494d22d2abc9d2ad8cf1137b9c26ebb43eb62bb361a96a8f0661e45db4bed17c9d81f7a77f0c427ca7e1d8bad333712be42d2de30e8 SHA512 ee981ef9d3d1d0edb450d0759daf04eb1c9aef28ddd106edcae5947180b1ec835b05a63cd2482d6a7b39bf1d9284d2841709403808bc2b651f1c01c01cfff036 +DIST genpatches-6.6-94.extras.tar.xz 4056 BLAKE2B 91ce861bb22c0e604dbc9e23fbc0a59baac8992f9c7ee1e1f3d5dbd28d3695f0621a6fc9b04af70dd16c0283af61b77d3560069b34e7b7457b3daf4db4a8e63a SHA512 a9b0632fb4c8fe27350e28b3bda5b2c2faf539e2d063e7ff04cb901ac4610c16537cc121117e283076f07318454eef6127aa326a401f932f197575baa5ea99be 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 DIST kernel-aarch64-fedora.config.6.1.102-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.85.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.85.ebuild new file mode 100644 index 000000000000..3cd7741b4cb3 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.85.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[@]}" +}