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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 980D815817D for ; Fri, 21 Jun 2024 17:00:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBC80E2A49; Fri, 21 Jun 2024 17:00:00 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FC56E2A49 for ; Fri, 21 Jun 2024 17:00:00 +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 7573633EB78 for ; Fri, 21 Jun 2024 16:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDECB1CF5 for ; Fri, 21 Jun 2024 16:59:57 +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: <1718989167.284d22f937b6d4367dbf9229dd05c8bbe2e00fab.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.35.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 284d22f937b6d4367dbf9229dd05c8bbe2e00fab X-VCS-Branch: master Date: Fri, 21 Jun 2024 16:59:57 +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: a6642bbe-6855-4716-ba12-42362a544a12 X-Archives-Hash: a61f757bf8f6603bb5ab23cccc8760ae commit: 284d22f937b6d4367dbf9229dd05c8bbe2e00fab Author: Michał Górny gentoo org> AuthorDate: Fri Jun 21 14:26:54 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 21 16:59:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284d22f9 sys-kernel/vanilla-kernel: Bump to 6.6.35 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.35.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 4b16debd3daa..2579e6db4e30 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -44,6 +44,8 @@ DIST linux-6.6.33.tar.sign 989 BLAKE2B a4a5a8415012e7a7dbff8394c75716966ea3b0082 DIST linux-6.6.33.tar.xz 140236216 BLAKE2B 6ebbd2c2ef18c285cf1176914799fa80120e2bc193d45b71ab76f2da36624c28387af1130f906420ea993cf92efff9c148e9409e7b35aa4d5e3cb72f36568f74 SHA512 445341c88c3976256c9f40149f62d73787808099c85e9cd6652a0b8e4ebfadc9ebe57169e5f7e586dc4d2c0679be58f688eadfcea575454465e8eda45261cc03 DIST linux-6.6.34.tar.sign 989 BLAKE2B 9e84568ed481e27a28a69a2ce5978d8aa3580f347fc4c16a83ddd868f9bb133b45df595c931156397037785b0698f183c8e0fae983c6a1ad0c0450fa82c1dbd8 SHA512 b9c3fb3d3e6335ffa9e0bb88526ca5d482febd0c3eded26e85562b0538ae2024d62db9e3dfed3771badc5d14d53a3097278c0ae6d3f50ceb46b71a9c37379b06 DIST linux-6.6.34.tar.xz 140238292 BLAKE2B f60ba869f55e08c63b7179d0c887c60dc495db5f70febf78956a2bf8c0636128e47e3ee626686df189255beef381119c1be76eeb1f4f8448caa7f9192cc4ea63 SHA512 eaa792be65c4cdfd37b84d4dadd22086c8507c1f78d538255cff03595e1caee0f88b521c398b6bc9ab3632010133cff5c7b14200413d54cf0a38bea79c2fd29f +DIST linux-6.6.35.tar.sign 989 BLAKE2B d5a5dfeb1e92c11107b71d6b2965d2a595e51fd3244abce72f9fdd0cd4405b562602695015e3cb8944f9ac0d999566c0007569b5141cb5f42d32458c20166f0a SHA512 dc98406c4b15a0e15623694e88b881cdbf082ae48f8e737d96bbeb1cec1c8ca6c9c5448b359447c6bfe34e8f1f6807efaa114dbe23097079e5046996134aad8c +DIST linux-6.6.35.tar.xz 140269708 BLAKE2B 93fff6421875329ab7d7ad2f0a0d3d1377c1eb42df295638c967eced3551b08986445b5e47b9d3bd1b24f93d3feeed43b1aba77f6912dc13449d956be3616571 SHA512 a94a75eec75f43fcab56a425927eeb299ec8eb72a056b26e9c629ec66fc5b65badf0403612549dfd4bc01b620451924ec30b980403a47cf723e98ab57775b6d2 DIST linux-6.9.4.tar.sign 987 BLAKE2B 0fff6dd562f11ad4eb3feb6b82a77f173f00bd229f43b88161550c470dbf81b2388edf3bd225e4dfa5e3a270f2c18aa0deae25000fee628c5287b522553a2ddb SHA512 cb557e875597ad7a633a0c846d5de5abb0742ef1b71887b2af7e468d368c3b9036f59ed328f33a233a563d965384efee8e87e24d48b82a42b8c14891c7955aed DIST linux-6.9.4.tar.xz 144059260 BLAKE2B 5579aef00f38e87ee9a9878ad4340aebc9c2590d8e813e2e106af59c6739e39a37267672ab7aff56160c8519d3014d139e6c849f33b9292c6fba019bc88d09da SHA512 33f4f817ad885479812d6bf4f9d3b6aa8f022828f81b6009488707b7f98a4014ad7aa70ebadc5fd06ebc4f49a92dca4980aa591f59f04678fc28a1207134e27c DIST linux-6.9.5.tar.sign 987 BLAKE2B 8ca5d6992b1e2d43be678d27fe019593521d6d3392aa6456ae5fcbfeaaa5e9b33d085159eb27c46494bd5e2db8cada61d7c0ebff903e49b5925314efb78ec77e SHA512 56873ddb3e567d14bfe97f980f79cc44a5ac651cfdb442a641d61c3f0c7c63df121ab4cf727238f58a131d88e1a505fc5a62d4c0afaa8f3e1d0902e8c1411e31 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.35.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.35.ebuild new file mode 100644 index 000000000000..2de327030b51 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.35.ebuild @@ -0,0 +1,143 @@ +# 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=g13 + +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 -x)) + 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 + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + hppa) + return + ;; + loong) + return + ;; + 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[@]}" +}