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 3E18415807B for ; Thu, 14 Nov 2024 20:10:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCD90E0946; Thu, 14 Nov 2024 20:10:29 +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 pigeon.gentoo.org (Postfix) with ESMTPS id BEC95E0940 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 D667E342FB8 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 E795A1E74 for ; Thu, 14 Nov 2024 20:10:25 +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.563ff265ad545cb814c3012e2a23295608157f65.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-6.6.61.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 563ff265ad545cb814c3012e2a23295608157f65 X-VCS-Branch: master Date: Thu, 14 Nov 2024 20:10:25 +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: 4de6a37b-82b9-47f5-a901-59f074a131a2 X-Archives-Hash: 1e9d7430779ec68dfdd0279b5c4127cf commit: 563ff265ad545cb814c3012e2a23295608157f65 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 14 16:06:03 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=563ff265 sys-kernel/vanilla-kernel: Bump to 6.6.61 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.61.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 9d554c08d530..1b9054c94b13 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -52,3 +52,5 @@ DIST linux-6.6.59.tar.sign 989 BLAKE2B 8060c1282d31f3ca4ec5552d311cf6a79d8f89efe DIST linux-6.6.59.tar.xz 140385136 BLAKE2B a280cffe2a9efa3cad8bc850c9b57486811fa2cc5abc29ae47d712f0f145c6d9bbe6686eb777d87882781d10b8f1d89dedd158c8f7991aeff04e473cbceea900 SHA512 f3de2ecb8cfd297d8a0123dc34d5fd1446ffc12f6a0c574f089e13e222b45dd6a4cf232588cd36c9c6818b32e3408c66c75c9ad9f4acd0a297e96e87668e63ba DIST linux-6.6.60.tar.sign 989 BLAKE2B 21bc9700b8036ac7e18704bcc6a5f21a8d5e2aa8f38ae8abef6f6a64fcea48de211fdf654d43beddbb6623d82ff9d01c1d0993d18b48d5758eaabea1d3b31ad9 SHA512 980c7a76ffc5d08e09482711de80d244545dffdc07d41de65d231704164efd9732c7f24b9b33c2d272929b5106d80cc95c3a4e44e885159c80b5f44070ac649f DIST linux-6.6.60.tar.xz 140394784 BLAKE2B 82e39bb4f9abe204c6361152fdeb5ad2ccfeec478f0af20ab795dd52271b159bcfe2d4aea32cd505a567a0bed64cb10b988283548ddaa5cbbe014117970e3318 SHA512 b23b7381be0879b92c17d3873d1f899cdf52c1a97ab998cb8ef8864ec9cd4cfb63da1ca775efa6576751a7a4adc51140003a53a6926dcc56a3199a0d2814f345 +DIST linux-6.6.61.tar.sign 989 BLAKE2B 5d61edc56e787a779e1f4366f5f441f4cdb8aa63b0ed73033ef0af6946e76cdbd594f5cc302a3e18783dd12cbc61723763197163e2e998e7eab8b45c9c6afd09 SHA512 38c8b644ca743d85309a49cbcc67a7cc79ba7259c4b9442e09aee1368bbf7b8bb5a84580d72e81be5b143d752771ff5d5c2cb9d0b6cfb896c4eb437ee81b1ec1 +DIST linux-6.6.61.tar.xz 140409040 BLAKE2B fa9c2c2a8427e6fa40f628fd8144c8b1c21ae242ce7e4977474f8a6484066ff375a93f7d8089f6ef60df2322187916c053029f93d667dabed2cbd3a5b72c8d18 SHA512 df3635ffdf68a2547eb3e992f4510bb5080bbeaea98731225f4d5e3c9afb532bc1f35f38321db49fb70ea0baec55b14f48b2251480c10432e8c428b2cc0a2028 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.61.ebuild new file mode 100644 index 000000000000..024fb0dc392c --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.61.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# 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 from vanilla upstream sources" +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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + 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 ~loong ~ppc ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + arm | hppa | loong) + > .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="-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[@]}" +}