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 6EECE158009 for ; Thu, 29 Jun 2023 05:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D2EE085A; Thu, 29 Jun 2023 05:12:21 +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 B8450E0858 for ; Thu, 29 Jun 2023 05:12:21 +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 CBD8B340FAC for ; Thu, 29 Jun 2023 05:12:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F17DAC9 for ; Thu, 29 Jun 2023 05:12:18 +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: <1688010911.8045308b0313d929763f26afbf41ee77d3d1d431.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.186.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8045308b0313d929763f26afbf41ee77d3d1d431 X-VCS-Branch: master Date: Thu, 29 Jun 2023 05:12:18 +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: d26d9967-8df7-4fa1-bd0d-b6fced92fef0 X-Archives-Hash: c1ced2c8c47edd714854d7325ba6e7f4 commit: 8045308b0313d929763f26afbf41ee77d3d1d431 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 28 18:03:46 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jun 29 03:55:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8045308b sys-kernel/vanilla-kernel: Bump to 5.10.186 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.186.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index c324650ce190..90cd44ab09f4 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,6 +38,8 @@ DIST linux-5.10.184.tar.sign 993 BLAKE2B d440ec9cdb79436c213feba8facf8708e808ad1 DIST linux-5.10.184.tar.xz 120597992 BLAKE2B 744b360dabd8474b7a4789475de654caacff203a96d8ece0b310fedb7006a38c20228b84ea8a8b07bd997de0bbc584e5bf0855a234a9af2299bdf6b8da5e862e SHA512 ca317db3984be7b75ea8b5304316164c8c65facced62ec83199aa7946f5a9ec3e5c14cd5ad7cd7efcda2db5b1b5cf2d95f8c7c7cdc706d1e86283855316d3dce DIST linux-5.10.185.tar.sign 993 BLAKE2B f17d03faaed07e4b6b88d809892365e9b3b2a94d7857ed8e51b201307442ab6295f87ee8aaa31a73dd545b4a193effd5d515d8067a78983860aa1a514c2bde70 SHA512 3e5b546a7eab982e0c51d0d70a4c106e668d5f97d5e649017575f951e6823f3600bd4e222b46707c73c082f2900f57798ae5c089d781c35303054b321e5912cc DIST linux-5.10.185.tar.xz 120562380 BLAKE2B 67193f01eb67e906f09a612f7b7ce7f4e037ac1770d85bf5b6b77a95f99fc6be6855a3db466d49c9f068ef7099a776b2674a3dcf32ac575dc5c2a04557f8e8b3 SHA512 17164d8adee264ac8518f706903bbf5dd66e37902bf1eb93df64faca4a9c977eea71f6694b403daeaa1c0ff2d8f858744aa9e3a3556b1ffbbbd36323739ab1cc +DIST linux-5.10.186.tar.sign 993 BLAKE2B e30659b0db0d993dc6f0fe2de7f9c26d0f93017b0d0ddba59da6632dd07b5ffd59b5a27d32c5d02cc2db6f7a8825ffbe8e6ca8d8faf6241c18f45fce7a4cfa6d SHA512 01114d0ecadbd17cf44b31294962933daa7986d86ff92f90c5bf71b62578fcb1a1d1196765aeb57d359f0e68032cfac62a1dfcccf369e400d6438c376e216783 +DIST linux-5.10.186.tar.xz 120570052 BLAKE2B b587b6d6eee838f20a50f2eea1dc2c9e8750d4c1aef6a59b26bfebba244e5337e4555ff771c4e41e51df41f14c370b30e35449f5c3a7bdcf702424633616cfd8 SHA512 748f37b7d5b072f02b2fe74ec40eb48abe7b6386b4ee8e9a614ef78c286c67ae979809a7eaecc34afa6f4e19f8cdce296435d423ddd9ccd7f88236a779e63139 DIST linux-5.15.114.tar.sign 993 BLAKE2B aa910499d419072a092b7183cda7ac15a34d128a0b84aabd7e2ec3ce692819c1bb403973167f8640a1abd53f091cb9808c108a246849d08d59d32a650646dc3b SHA512 d5365a0738d6b950506787e1a321deefe9c728d34678cf88d984ea324950f92e0fcb6cea64e87f284a549edac36b8c0a1eccf6321334c4ef430102ff9c748f52 DIST linux-5.15.114.tar.xz 126540708 BLAKE2B bc4a7b2f928219186e81d04d1eaa46f0976decd53112c4f01a4c698fbf7897686e02ad09ff8695e3337934824c254ddfed6ec76c66c30ec6495f4aab7fce8cd1 SHA512 2fd0a4143592f989663301f5f5d34df0ce6cca66c0c262abe2926e942739b3bb4b7a4faee0e446f6e3ef52fbf2a756cabd8cc8b18a3243c269349a1e6399218a DIST linux-5.15.115.tar.sign 993 BLAKE2B 668a30bb360c98839e15cc1f5fb4d0edf93fb819d7f36587cb651dff7389a642af4eb8cb148617fb666d9594891c7f0620088c0e7b4d211b91b61b16892a8e77 SHA512 b65deba6871540e7a04210c4342e28d65c754daae52f3e7944ada55c8dc32bfe2909e222f5a8ad5c3518cd13096186421590e5b5e4318742ed1407815eed94c3 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.186.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.186.ebuild new file mode 100644 index 000000000000..3d406f474e2f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.186.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=g7 + +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=${BROOT}/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[@]}" +}