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 B983C158083 for ; Thu, 12 Sep 2024 18:23:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10A16E29B5; Thu, 12 Sep 2024 18:23:35 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEAE1E29B5 for ; Thu, 12 Sep 2024 18:23:34 +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 BE8BF340943 for ; Thu, 12 Sep 2024 18:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E73CB1F55 for ; Thu, 12 Sep 2024 18:23:30 +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: <1726165216.780ae1912200aa4585958e7781a95a0620ba044f.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.226.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 780ae1912200aa4585958e7781a95a0620ba044f X-VCS-Branch: master Date: Thu, 12 Sep 2024 18:23:30 +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: 9df076eb-25f8-4534-bdc7-52d51ccc2ea6 X-Archives-Hash: 626cbe5f800a65ef9960ef152990eddb commit: 780ae1912200aa4585958e7781a95a0620ba044f Author: Michał Górny gentoo org> AuthorDate: Thu Sep 12 13:25:23 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 12 18:20:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780ae191 sys-kernel/vanilla-kernel: Bump to 5.10.226 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.226.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index e3ccda38df65..d401d672065b 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -24,6 +24,8 @@ DIST linux-5.10.224.tar.sign 993 BLAKE2B a359659b5af01d61ee7e5220b100cc811b60de6 DIST linux-5.10.224.tar.xz 120718024 BLAKE2B 122032b13a7909bed102f2f26c74e5c743938790138a56afec0c11c878303f26ae638307a739c547c5bd491fe15ad9b261622909b2c60784a96f8ba8389e48cf SHA512 43c038046601a32100056d67300ce32700d04c081935964b15732e749fce5bd70c54a3a2419f85a60ccad229726698d3e163e3b9959156fd6e0cb653dad27541 DIST linux-5.10.225.tar.sign 993 BLAKE2B b399927765ae171a6546c53d9d7616e078fa439a06f6d5d1320dcc3a0fc26e107ed687f576a02bf1e21eacf745c224a9000f5ab393c0c5363bfea81d5edfae06 SHA512 bec048224675a22a6e31bbc0927e5d20fb1be4127e04b06cd294b2b57a0f8d24a08622687559429f0a53f76235009ae7be3980092ac28b22eff99a080019a44b DIST linux-5.10.225.tar.xz 120712240 BLAKE2B e28e0bfdbb444bbc63756d3c6c96a43555c653c3f32fb459254e6b0c395757a5c971a6c2ec73dffa33ab74c1602fb38d0c2f30c542f28a2c62a5bd1f32501f8d SHA512 db8466b9c16afc824df8a06d3f2239c0199502a402103b8aace37a0b7cda34408de664b90156e1fd9bc554fb48d547c5c13843d8a899f8c29a828d87d39dc377 +DIST linux-5.10.226.tar.sign 993 BLAKE2B 4270f42f91b03331d06a1e0d1612ee2895e19170f796f7e4632d0da0e429fa2d74bd5a8d8d7940ef2f66a281d87b9a58e11e5d8fa71926ca0a75369dd2de2ac4 SHA512 55b6d490315e09afdf6aec76c2b8856597e33c1009e552cae69bbf15565be45ad17853e95d7fca36da8c23d6f7027e2aac8a04abfddd6483d4120b498bebb99e +DIST linux-5.10.226.tar.xz 120709524 BLAKE2B a072b30b5ce6bb0343d19cd29c9dd12a3af0b2c5a319cb3e6adb3a40e2befbfa1c07d7716a24235b094a3178917ce3a0c3dbb6155385eb31e9b047f312b5dceb SHA512 99f43ac2679bb9f90df4a7cad39b98a44e8904fe50cd2c5c40ea766e86af24f16c258836c0edbfee27fda4830b773d5a0c13ced8d304b88f5d4ee12aafbd6da9 DIST linux-5.15.165.tar.sign 993 BLAKE2B 4c8ddbb7540bd7b9250360c3b55d1dc6c06a3962dd6f1b0a07175529aca894569afeb3e53b2237d8bf36a091797784a982dc15f620cdd2e769a694be749a02ee SHA512 d8132e4ff4105761925a226981a64e310c56f0b1e76490be28c97648070d62b98ab025f115a09257a3e9f58b2d673a85a03d37adb64a06cc597a325f4809108e DIST linux-5.15.165.tar.xz 126684752 BLAKE2B cb5efc3d57473da217b35f4e870c78fe4a647828031271c0300f8af11b041bd61ce6c3a0aff9b65e1fbb1af0d6895637cfa8dcc258172b71143116c940284a09 SHA512 37c8f7e88727b3be43e03d889330d70d5f3f87f7e11b9cee98e2812b5dfbe97bfe18f655efcbc2c7fbdd883e6d8d32609021aa054a6da53450490bb1c7855d49 DIST linux-5.15.166.tar.sign 993 BLAKE2B 4f50d975cb77f23871dd402b61a07998deb0705df4b8baec9ac0d3228ed2c39995c03d766de31aca6cd2445053184b653ddcd88bd2bd91d7175388e870ea53c4 SHA512 db188fa382c4fa26e37865c8415640f5c7e0cfb20d84cad855fdf97b874d09fa6148a328cb277d215b1933c95489402c81f7798174069b460dc1100d1e1c57ae diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.226.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.226.ebuild new file mode 100644 index 000000000000..3816ece2074d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.226.ebuild @@ -0,0 +1,134 @@ +# 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 + 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[@]}" +}