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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66AFA1581C1 for ; Fri, 5 Jul 2024 14:46:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBD7C2BC0FA; Fri, 5 Jul 2024 14:45:58 +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 3D6952BC0FA for ; Fri, 5 Jul 2024 14:45:58 +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 D4B2E33BDC5 for ; Fri, 5 Jul 2024 14:45:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56FF71DD9 for ; Fri, 5 Jul 2024 14:45:54 +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: <1720190743.6ff8aa124def192c73a8303b00a2a94a8542949a.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.221.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6ff8aa124def192c73a8303b00a2a94a8542949a X-VCS-Branch: master Date: Fri, 5 Jul 2024 14:45:54 +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: b7aecd2f-73c5-4b69-9bc5-f4c210274257 X-Archives-Hash: 3c6ed88dcee0cfa948f4fd3b4ea7e2c3 commit: 6ff8aa124def192c73a8303b00a2a94a8542949a Author: Michał Górny gentoo org> AuthorDate: Fri Jul 5 11:25:47 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 5 14:45:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff8aa12 sys-kernel/vanilla-kernel: Bump to 5.10.221 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.221.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index c06e70e05e54..ac706d2a9f59 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST linux-5.10.219.tar.sign 993 BLAKE2B 95b8b7e6872b277d6bc83f8643f3a591a615518 DIST linux-5.10.219.tar.xz 120669448 BLAKE2B 9c16889fda8dd02ed2503af913bac73664e405dd744437a680caeff7c7553088272b95c074ab4a23401f9c3a38b7db45ed426412c131538f16b96cb58a7968c4 SHA512 e62d8262654054c3a05e5e0a62dcedc51499fcfa078a4c19cb52c6dca82a83125152b83aa9bc0fdd448f563fbd71409305402d1a12cc8c7a038b8bed76ac482e DIST linux-5.10.220.tar.sign 993 BLAKE2B 442c173e64088fd8ffbde6cf93c4b29535fd9cf7a8a8979da1d568abcfb1facd43328ddb7723b787c9892489c116e967ed11e89994cbba91ec5071a0d83b81dd SHA512 65693c0d34cf076107ada46e2c5e08454d96d75709cfcad433bf9bbd30e8ed2f2a7c55f3892a1a9614243acb3a9a0b7c641870153a79584e05cc150031af275e DIST linux-5.10.220.tar.xz 120695464 BLAKE2B 3edab181f6fb65a610cced69aecf42304a09e3592e01818830c40903559afe44cd952e49acd602fea3333a4c505c5937116a95bfe549800396a5e58dc37f63fa SHA512 419563f3bea8ea44d51e5c3b2e8e1743aacddc3092c1e81cc97212ced1398f284cd50431f3709d9109eb5ee8fd3405afdedfd2eecfd09d4fa230c8354b9df2cd +DIST linux-5.10.221.tar.sign 993 BLAKE2B 85d9196bffd6aec1cda34361a4d973c999499057a3aa0db56c93d6bb332f4d9cc2edd6439b3b4c5f6685133e3d59f2e2ceba4aa680e8240070407f2040522f45 SHA512 5db247653176780726cabd3e969baffbf473862d15af17ff36d6ba60a8f6d1358e52bf90511da0df7c955eb11a1f7a2cff2097d05530f92bd4cc24375d1c5c2f +DIST linux-5.10.221.tar.xz 120696852 BLAKE2B 4dacaacc8c3b5d326ccf3b8689941d525903e6df6cb8ca3f492815a12b27641ac30c2d749bdea9ea13ac9d3e78e69bd05f0b5f7eb989d3556a10c0838144c8df SHA512 55209b60c76a88f0f0b57f19936be7d424cdccd5e03f71d2d6c7ce9794f571ca6c7433edf158bd3b300556ff8615e8a7b651505040dc9b8f14733be2778e8c4f DIST linux-5.15.160.tar.sign 993 BLAKE2B 55143ec2dd01ef5d5ced58fc80bb5cc1ea0f54f593272bd0d1e988473239a79f8f8a92cbc21102e551b7a88ad5e263d0ad9903e5eb61df129abaaacb9c5d229e SHA512 981651ebb138ca223abef22dd21d4b7d856aab0524c37b6418a6320bf39fc2af26012fb2c57027b0bc30f057dfabc61ad0150628f343f76046726a254fd9b420 DIST linux-5.15.160.tar.xz 126646360 BLAKE2B 1eb8a99444768acd9c1259625220f09dc8fa3bce6d854500fd2e6fd24a575ae20ffc7c4395c096cb7bf5f075b6cf478f128ec3cea40fed2c2c38ae5d241c91ad SHA512 8d5839dfbf72024fe4c22e556f3d3c209cbe21d7682cfc86fad76708472eef87bd4c81d7bb7d5abce438b99855e4e3b9214c8d7bb31cc695b55b7ddf7d3d7edb DIST linux-5.15.161.tar.sign 993 BLAKE2B e6464f00b905ab861421e87a96dfb2e54d433e924401cd022dfc8a7801767c1cd247a59a9beea84664b6895e49c8629f58080902fcf1728706ef57bc3e954adc SHA512 fdaaf0f6d49c4ba04920723c0352fe067d31b6abfd9625999b0977b23e73c03ad4abb3fbef818128c7183a45a9e001d75d2b127f90de65a4249bf73b0ff403fe diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.221.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.221.ebuild new file mode 100644 index 000000000000..900f0cd17578 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.221.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 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=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://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 -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 + ;; + 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[@]}" +}