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 78D20158042 for ; Thu, 14 Nov 2024 20:10:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C41DFE093D; Thu, 14 Nov 2024 20:10:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 AB422E093D for ; Thu, 14 Nov 2024 20:10:29 +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 E8CB033E3A9 for ; Thu, 14 Nov 2024 20:10:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 078041E89 for ; Thu, 14 Nov 2024 20:10:26 +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: <1731615015.9db513a3b6c9a987fd3cb813b1169f81c74a5760.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.61.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9db513a3b6c9a987fd3cb813b1169f81c74a5760 X-VCS-Branch: master Date: Thu, 14 Nov 2024 20:10:26 +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: f084efe9-4972-4ec0-83ff-76bed03e461e X-Archives-Hash: 2b29897ad78467b325517aa83bf091ec commit: 9db513a3b6c9a987fd3cb813b1169f81c74a5760 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 14 16:06:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 14 20:10:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db513a3 sys-kernel/gentoo-kernel: Bump to 6.6.61 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 3 + .../gentoo-kernel/gentoo-kernel-6.6.61.ebuild | 144 +++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 28e5651a7a17..b10576304405 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -36,6 +36,9 @@ DIST genpatches-6.6-67.extras.tar.xz 4056 BLAKE2B b8240a27f81aadce548d5c94cef315 DIST genpatches-6.6-68.base.tar.xz 3686816 BLAKE2B 56331bbfcfab2851304dc8263025d66e7efeab1bbc4f4a4a3969e08cf239a90f4e9fcbd381ea55db94682e8e45e6f2e73748f50eac44ad65dcf50e3b1feae75f SHA512 29b269918f54b72c4ac54a3a80d9e2cde64fc281ee6ad236be3d44e7da8ec58d9a1aa9c1d94c02cc88d28456cd9e4128bf15a381b95402f32226af9669876cb7 DIST genpatches-6.6-68.experimental.tar.xz 5760 BLAKE2B c73f35de8a9dac3f70726649b34ae381ea8843d96f2d81c4f84df08b6deb4e0b2536646d5f744a76c25a953ae5baf13783ff094dd0358baf59a4127fa349dd38 SHA512 5c201032ed575909cb58e567293c13210bdd9534557c4b93f1141369538127ae9c559a0243fcfba466d24ba009ce576640014a9ba5e759ac7e241bd2527968cb DIST genpatches-6.6-68.extras.tar.xz 4056 BLAKE2B 61235851cf180cc5a8e17720907cfcad6bf993ce2387e3ec4012ddd8a23e24d28b02ab2dddaf1a95125c92b31294655f294a7f3b1b5fb6b8597b02959f047126 SHA512 4065216d3251c0af7bd7471667e8cd17a62d9f9f7a1f06a208cb7ccbf65160ee0d6a98088f872555ba9ecb8403355eed80a0ae6b20aa4326b1f43e876edd85ba +DIST genpatches-6.6-69.base.tar.xz 3711268 BLAKE2B 90b1f63e88059b3a7bf2b934e7bab30b68c71bd3991f749031090f295ec62a43dadc6d44dc2938608d771b3052f3b6d93e76af4a8007c0d52ecf6b50577a8486 SHA512 00c2a2a01f7680ed25a3372c62cd0042de78c48574bc00655f9774051a4704193f030ade5503376395367f34649b018a7894a8f4f8ff67f3bcb19b92e55b8023 +DIST genpatches-6.6-69.experimental.tar.xz 5760 BLAKE2B 4443f67cd404f2fe8c1cb6f6391f5c93d4d04ee35864ff280f63ca0bb2b38c040c38f0a1de42559068ac19fea61f3a97dbe7fea888e783d87adc1db70cb36c1a SHA512 5a85c2394a8a7025b17fcb054d543e776ba90bde6985e054d3db5ef5736cc6b7d210a97d5ce33e66dd0186d9a96868fa947311c55c1eb446b149ed9bbf78269f +DIST genpatches-6.6-69.extras.tar.xz 4060 BLAKE2B f519a90411e0446558cee950fc359b3e11dbd08e9624f4345880d96ad6c0384b0be21603c01eaa5340a9e37e10c1c1f516d42cbf756afc759d4787b952590ff3 SHA512 c21cfd363be608778206e5fa1d41765825336e821b22b58e0bb9a8d84f9795f2d78d12cc9e008aa5d809788d9389689e3045faefe3191e1fb98393a27007006a DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502 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.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.61.ebuild new file mode 100644 index 000000000000..b94f0d5ca83d --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.61.ebuild @@ -0,0 +1,144 @@ +# Copyright 2020-2024 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##*.} + 8 )) +# 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=g14 + +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[@]}" +}