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 783D515813A for ; Thu, 09 Jan 2025 20:06:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38F01E077A; Thu, 09 Jan 2025 20:06:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20D34E077A for ; Thu, 09 Jan 2025 20:06:01 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02E5A335D6A for ; Thu, 09 Jan 2025 20:06:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 666B911B5 for ; Thu, 09 Jan 2025 20:05:58 +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: <1736453140.9303d33b76e8a007163c6848f9389580fed8bf63.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-5.10.233.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9303d33b76e8a007163c6848f9389580fed8bf63 X-VCS-Branch: master Date: Thu, 09 Jan 2025 20:05:58 +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: 233f0184-2eeb-4e3b-a0bf-b56845c1f36f X-Archives-Hash: 787a587010e06d5978e07d425d6d8970 commit: 9303d33b76e8a007163c6848f9389580fed8bf63 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 9 14:08:15 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 9 20:05:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9303d33b sys-kernel/vanilla-kernel: Bump to 5.10.233 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.233.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 3b8fcee38d70..da0873d2e0f7 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -23,6 +23,8 @@ DIST kernel-x86_64-fedora.config.6.12.5-gentoo 256170 BLAKE2B 39e03735453c66f426 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c DIST linux-5.10.232.tar.sign 993 BLAKE2B d3b71bb420a88ae5e1f9aec2934649089332c343d4f91a7327c62309f9980387dfe8532b22057d8022b630e7ee8504fa439c645ac61bfe671becae18f1c7aa8d SHA512 89f4d467c7b948281862c37053c2077d2339f5d04584b98a2f991037cfd9b36fc9ee6ec86907f301a64d27f826295f582aea352cb1405d277d05ffbc112f31a6 DIST linux-5.10.232.tar.xz 120744848 BLAKE2B 76ceee78867bb21ae4fab0840210e095ec744fc7035c99b06eb3432c4a592f3f4f9364c483dce4af5d3e178cb8fc7fb9baa6e6c8d25598c3f84b79371f482c59 SHA512 d0f3c2c6f9e47ed8e5de8e99c3e7f3175b6cb015916131ea9f7a9f1ee8aa29c7ae2fa432bcd1283bd0529654874f4f67ace208d2a8d01fc6595e4abe36ff1fd0 +DIST linux-5.10.233.tar.sign 993 BLAKE2B 9c1dbcd403a6f0192cc10af5a7472df308bfda12999b6a6cb503f92dc3061d3879104cef205eedccbcfbe6c0fe4e809a9491bdd91073cc82ca442fdef7321136 SHA512 6608bdfe56e6cc4d89c875a14a4fede5e7b786b8db6a8567b9a0dd819d0623f009a61e99019a84233678d7ea1da5019d8ca2f4e86bb7749d14cb97141bcb2603 +DIST linux-5.10.233.tar.xz 120756924 BLAKE2B d7ef12d74cedf1b9774f35418439019174e76bb24b6fafd982b98429f48811c2ea36134f4c755589d4f8d802a7b47462432c4ed7a098a6c74b9eb923857249a1 SHA512 af558e039d7abd587ef7f3f6001d991b4c63a209e9ef0a8d21d3fc9bfaf253f0a48ab29da3a9f074de41849fe440c299885680e887620826b5609804b369b270 DIST linux-5.15.175.tar.sign 993 BLAKE2B 580b9336c93e15dadae81be6b8b4c53c4f64fd90a04cbdd28e474d12dd11b131ee95440ec215db069f591bfb4a130ccbb6cd33c2dd69a65f3ba516f91e79676b SHA512 4c774436ed271addf12b208382d4fac5f114e045166999d81d0e4e4289e1fd9a6bf9d252a47e7442cdb2d8aef4530a7eb7bf21b004811b677342bc71e722c6ee DIST linux-5.15.175.tar.xz 126721664 BLAKE2B b4eceab9b42c92f71620591efc41d8d0bf585c2cf10b0364276984149115c7f2eb80ffed5083e6d8fc9bce3238fca5b950e93dd972e2e463480b12a917f28410 SHA512 f7215508a564b823d673cebafd102abe05e5d25f0de067f8fede254f30c8ec0e66b42f7d50e76db870b126ffefc14e12d4d02496c17cfe54bdf88287df3c9d19 DIST linux-6.1.121.tar.sign 991 BLAKE2B a7417d28ecf3d3cb4db0aeeb084b3552f8ab5de061bef8316f67b4e74566d965a0a00d967aff155ba92765cd69cf4256d2de6d94bd92d8f72fb3efe5ff9fd80f SHA512 a45b66e9d1d8fe20c70e07ca3269f24f75ce28ac6842a2db1afb63c0aa238b155b5f3dc127bec71376b6da5932e217d7fca3a885dda9d5b4455f30724df193d0 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild new file mode 100644 index 000000000000..69d61ddb8e86 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g15 + +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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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) + > .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 + + kernel-build_merge_configs "${merge_configs[@]}" +}