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 490AC158042 for ; Thu, 17 Oct 2024 18:50:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29A1EE0938; Thu, 17 Oct 2024 18:50:19 +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 0A84DE0938 for ; Thu, 17 Oct 2024 18:50:19 +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 0020A343062 for ; Thu, 17 Oct 2024 18:50:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C9ABEA0 for ; Thu, 17 Oct 2024 18:50:16 +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: <1729190997.61cf21b1e8b1c21eba1bb507dcfe8befabbe0daf.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.227.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 61cf21b1e8b1c21eba1bb507dcfe8befabbe0daf X-VCS-Branch: master Date: Thu, 17 Oct 2024 18:50:16 +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: 0b6f25cc-1590-40cd-877a-9ee26a3d4047 X-Archives-Hash: 56bc26a95cfdff7b82850dda9f12d210 commit: 61cf21b1e8b1c21eba1bb507dcfe8befabbe0daf Author: Michał Górny gentoo org> AuthorDate: Thu Oct 17 14:20:11 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 17 18:49:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cf21b1 sys-kernel/vanilla-kernel: Bump to 5.10.227 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.227.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index fcd4fdf66230..4e09f3ebd03a 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -27,6 +27,8 @@ DIST kernel-x86_64-fedora.config.6.11.1-gentoo 253553 BLAKE2B 3018a46753250657a0 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c 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.10.227.tar.sign 993 BLAKE2B fc17d46845bfca6a917cfb7801217132d157aa5e7d7366e45cee87fcaead0dae49fcac96cf7d93b4d02a4cb71326d39aba09ae88a8baee0bc290833dc3091fcf SHA512 12c80919443b6ffc9c8cb6e5b651b20cd770cc09ad16e9b12aacc02f5eb5260e605b231e1426aebb2496caaf0f9c9ae8dd1850d72fe0f6f7084dc2514c592352 +DIST linux-5.10.227.tar.xz 120717528 BLAKE2B 160b2b9056c9b2fa6a2772c57ed8d9e072372cdc71efcdac93f46f348ab7c790cd11e391b7fce31115dc9270d4dccdce9f3965753d4266dda7a12630558a5bd6 SHA512 163fcc3a2aa15f6a3f5f0148ce3aa6bc650df0a763c6b0a76531e0bcfc164f69a1653043650d030d5e5fa3cebce4f63ca68d05db02166fbf00b77d3ebbf679f3 DIST linux-5.15.167.tar.sign 993 BLAKE2B e3a74697c175bc3b6944b05a754fb015edb1137d053039b4d122d43b2ed02c55218736835877f37bfbddcc42b115259049d391dcaa4ccc319b445ed9b21d98d9 SHA512 c42daa300b5b95ca1b3e5c1874e0112ea66f2c4d51a2d2df59ac0b3094945a39f98324d75b53a2e29a564ce2a091376dcbc8ae0166df78aa73042d85552fc605 DIST linux-5.15.167.tar.xz 126681812 BLAKE2B 24acaf9a064f4b2af4a272f49ad63ac565fa55408d595f4c15ebcccd8a44a2ab964e5bfbb9b9b10f765d741da541c9e3911aa7dee3164c091b203cd06c5ad08b SHA512 3ce1848fef40dcee6de3808574ab236c72799aed5aa5a295d169b45ed529e254b43df81c9d9b15902723d7316c3d1af366aeee815ee9be985cd2d380e360cf0b DIST linux-6.1.110.tar.sign 991 BLAKE2B c93c23243b3f9df9da66cd9c3d1c65d6cc09212b53c3a19d4a565ea9566d2831938f3aa6c25b88fe7e85268aa0bcac8bdd5cfac472d610b95aaec2ee2b39181f SHA512 9fb593858e2af689e2e1d5171e70f2b707a4bc77ae721e6950115877b084c49dee340e77f12bf40761793a2cde306d513ca2e151e3c159e55906e129d458b8cd diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.227.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.227.ebuild new file mode 100644 index 000000000000..2f3273b2f39d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.227.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=g14 + +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[@]}" +}