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 4E8B51584F2 for ; Thu, 13 Mar 2025 19:00:42 +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 364F8343198 for ; Thu, 13 Mar 2025 19:00:42 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D48ED1103E3; Thu, 13 Mar 2025 19:00: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 C64671103E1 for ; Thu, 13 Mar 2025 19:00:26 +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 6B49C34318F for ; Thu, 13 Mar 2025 19:00:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85899280C for ; Thu, 13 Mar 2025 19:00:23 +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: <1741892406.8a859c1172bf3d14e4c681de1e3f4716e3a7e3a7.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.1.131.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8a859c1172bf3d14e4c681de1e3f4716e3a7e3a7 X-VCS-Branch: master Date: Thu, 13 Mar 2025 19:00:23 +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: 61052579-5339-4015-a8b7-b7e5239c3d38 X-Archives-Hash: 4dbab560cc6de5a22432ac11ad1ed9c3 commit: 8a859c1172bf3d14e4c681de1e3f4716e3a7e3a7 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 13 14:19:06 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Mar 13 19:00:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a859c11 sys-kernel/vanilla-kernel: Bump to 6.1.131 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.131.ebuild | 132 +++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 6d6efc494b13..b8f529b5fb2c 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,6 +31,8 @@ DIST linux-6.1.129.tar.sign 991 BLAKE2B 0bb30f02ab11b585b2c4501e904ab6a198c6b2fa DIST linux-6.1.129.tar.xz 135266412 BLAKE2B 9e865a581cad529fc7109cb3e33f3cfaa428b2b6dd236789488e834b080ae2c2a155aa326663fdac11f374f61a223a1e216c6f9d496aee5e903f25df4961d01a SHA512 dbeace0a2a3601219ec927df31158f4f83a8c4830ec41a59b5c60cbfe2b5363f02586257ba47abcf09c26f0f8fa5a6a77db97f9aca2337841ab80aeb0637aaf1 DIST linux-6.1.130.tar.sign 991 BLAKE2B b265afcc1946e0f33c58d229f0478bd7963807efdee1e45d2cff2f1badd095f03805ccc02b8e8fa5348d302e73a244505865779bf630d9af87683e8e0dd5c6a3 SHA512 df72a271bac993132492d8d68be39f4acdd04bc4986521990821ec53435e55a80afa9ad3dac5299d3ee02cc87def4c48ea4bf0a593fc7fc80cee89efefbd6c38 DIST linux-6.1.130.tar.xz 135258000 BLAKE2B 04c4826d015c7f0d38ee67f1a139c60d3f863d215352fc7cac85a2f907db6f09d02c7d6fb2c85306d3333d8a7baf7be96450702a8ff75453b6108f3573e3d809 SHA512 546aa361cdda1721509064c8b8a2e05197b4f06d36d84af3c7fd9c165cf72bd2ba6143a902a6c0f6400b38bd0090a67b751b80638c178e56f7f72f87e8a5c538 +DIST linux-6.1.131.tar.sign 991 BLAKE2B 90ad61bf9bde4d9afa562716ac2bb54d4bb1f1ce9f6aa78722294f1b95e1d2c37f93ff3ddb18a15820a5fa93c12efd2e74a2fde0d5a113960a3d81a97d7dce53 SHA512 758ff1d0f1061c1eaa06109a7ce13be850b9aa43c2f62ce346f5a32125a52ae4a1fe6225a23cafc91f0a55b7b5d0fc6516b013686f9b4d61fb397019c14207b5 +DIST linux-6.1.131.tar.xz 135295220 BLAKE2B 5aef8d29bf896cde0c85f9486859bcef9628a7139fa701f0dc118318ca1bdbb1c78be31f2b4ba9b5dc209dc3e389fc935f3bdd64aa4650dfe88f922d0f696fbf SHA512 4fc8628e8593e7a713dbaba23f5f46eb94813d3a34791bbfd643d719e572ca4c2afa0b1e2b43dc3a664a9a2dca4d3c4145cd3c457636537022d52003d8b979cf DIST linux-6.12.16.tar.sign 991 BLAKE2B 1cb2ab38031cb9a4523388f6bbddb3ff2536cf8cdd10b56b96c1eceae3f3be3c1ac3e627a5ef872d1eeb8370bb36e1a7306510e912508ede9bffda782df60ddb SHA512 fc5a5ecb830bf3120cc9bf09e597d1b3701a417a82b728500cf6dcce7b162f47d04f065c915e5b0bb2c9782e29c61d81f3f7a74a4cce76d4b1309b5e31ecc913 DIST linux-6.12.16.tar.xz 147993844 BLAKE2B 756e29cc878322b961957f4b725806a2447c9de83799b57c5309106e45fb8aaf947286ea15a0ad7b9733e96155a50ad57bac5a0a7bb54df11dbc924bffbe472d SHA512 744b985df4c63e27e01febec41fd8dc24f1dfdaa45f12f3b044f45d457718ff3c31bf43abc8b6513d486dfea6390ad5ba342b8f8a53030dd30a90018b782b917 DIST linux-6.12.17.tar.sign 991 BLAKE2B c27588ac039e6f589cc5e7ed50861cecee0e702de2e7eda7a5b2fa86bba479ae867159cb577fc6e1290ab5d782118090fb47e8854f23e0bcc99335c61c1e5dda SHA512 468c561acfb5eecdd22c485cbeba3a569eb3574699c3e60c90221384f624a9f53179fa6ba882231e26dc4140b094817b33535ed2b46bfa527015317e00fcc12e diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.131.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.131.ebuild new file mode 100644 index 000000000000..f922ce9dc716 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.131.ebuild @@ -0,0 +1,132 @@ +# 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 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.102-gentoo +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://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 ~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 + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} + 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[@]}" +}