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 13CE3158013 for ; Thu, 14 Dec 2023 04:12:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDA312BC04A; Thu, 14 Dec 2023 04:12:32 +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 983422BC048 for ; Thu, 14 Dec 2023 04:12:32 +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 DD6FB34027D for ; Thu, 14 Dec 2023 04:12:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 124D214B7 for ; Thu, 14 Dec 2023 04:12:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1702520119.508ee1f8ffde11c5c45eab9ea87bf8eec8a1c1e6.sam@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.204.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 508ee1f8ffde11c5c45eab9ea87bf8eec8a1c1e6 X-VCS-Branch: master Date: Thu, 14 Dec 2023 04:12:28 +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: 6648f157-6b6e-4599-965a-4d778fc2492d X-Archives-Hash: c1511b136e932e3c74d67dfd8d0a5625 commit: 508ee1f8ffde11c5c45eab9ea87bf8eec8a1c1e6 Author: Sam James gentoo org> AuthorDate: Wed Dec 13 20:29:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 14 02:15:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508ee1f8 sys-kernel/vanilla-kernel: Bump to 5.10.204 Signed-off-by: Sam James gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.204.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index fa9dec9f6774..4a8605abc63f 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -18,6 +18,8 @@ DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff8 DIST kernel-x86_64-fedora.config.6.6.4-gentoo 244310 BLAKE2B af982d23c80d1b19f84622298fef525cb0b51680d0f064c8cc940be33b55aeba6e8ee913d13bf33287167a48891e6e26ae8ce4f5a1644714132801f4a8b7c319 SHA512 913a9f9aec6898dc3a86611539835861b8d1f1380f699fdcadf52457619d5e6fdde4b9866a6216c50dc5a337cc09fef7b3a00a989cc6f9ab512dcedb15dba8ff DIST linux-5.10.203.tar.sign 993 BLAKE2B 469e13a9505793c9e880a4c484c416954accf621fbae1137427e128aaf88294a7f315348bd8c8bad62d90ca103c9572eaa90ab6aa5540853c30a879588f05f80 SHA512 1e103f66444dbcf02df91a787716945e967bd8327293d899cee26fb562aec304b8ca2cd595c7acbac318d1c7b9fa21901fb8653a7eb2bc8f68ed2e3a0d58e0ea DIST linux-5.10.203.tar.xz 120634508 BLAKE2B 2e37aa708cd941638bc237575824a52f10af50d54ad8402de575e65f76b2bf52aec3175b42f5af3e7600f5565fbdba6716e4f2aeaaf2142b88f7f48f578f9d0d SHA512 294552eae37ed4dc3ae6841feb5053c50c11d07cdee5924125664d313a2dd7335df06f8b94e7917cb3fa1142251eb75dc272edea2f049e32f8f792f059cfd5d0 +DIST linux-5.10.204.tar.sign 993 BLAKE2B 00a1a1c338c95875d5cffbaf628cb2b9611b6a776011265f96bf805c841d2b5a8bdd08ff7a9f8076aeef1aff681d77bcbd7685d446bc4cfca7523226dc27b9a4 SHA512 fe8d88d33941f225e28e8910c945af8ffc6d9ae0bac298a11b6a62bfa2def7bdea71a1b33123f8fd87c2b61c11b4b725cbd0eee334edb9a722473d7f6973ea7e +DIST linux-5.10.204.tar.xz 120618840 BLAKE2B 804a806d9663cac2f2bba12a5bb7e17b6fa3f8afd920b916294ba7179e780b6a1455ae75b535cf66520c5af2f45114bc1f7e8872ea17cd112c8eaac1989f8c44 SHA512 e7a2a2e73c99300c86ee08cffd257261d8316ad223794d0c739e50778e71df7f4835b6244d34911d073ceaa4ad9347b240f3d18ba5bfcf99293f08af212b85d3 DIST linux-5.15.142.tar.sign 993 BLAKE2B a83dca672bbede453afd57d145da6d431a7c2704f1df582b06cc1f47eeecfd0802425a4e83a6333fc30b91182139cebeeb83b451168f24c45cc46fbb64a1c835 SHA512 9f87826f9f734ae60cd2d9e7cd15310040baece0a1f6682ffe5127fbe7ffb4f76b274755ed212ef4dd3174ad3bbbc8a2f10f8a9fb5bc91b0afc6c4fd8f7a0310 DIST linux-5.15.142.tar.xz 126559304 BLAKE2B 1963fa38ec41da53253eca60f0b065a5809a276ac5e8f6cffe83543b4ef6afaf392c02befb781fe083feb77c5811dd49e38371a6bc51b85714457b364ca151e6 SHA512 d6b09bea7d3a5f882c9f1b027119168a1c61447958da6f008a5a95c7504742bc9320c82e0af34d2267ca43af5220ae7331d46c8f46782f6933b8a457f0bd996d DIST linux-5.15.143.tar.sign 993 BLAKE2B 33f613919ec91fd0160598704c8a712e9629e314119a3e7b4d35fe808a1f29e0caa00e66a992bbed199360f17d83d00b044c5d3279b7d25a6a485ec85fb7ffc9 SHA512 0654b319ce52effdb69f01a8f03da70bb545646c3bae8b93ab9955f066a067ae3ecdb7a8e7ca69d0e70a491ae838a33a16f14bf9ed9ef15a39270d88484d8733 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.204.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.204.ebuild new file mode 100644 index 000000000000..7f46104fa7f5 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.204.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 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=g11 + +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[@]}" +}