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 E18E5158649 for ; Fri, 12 May 2023 11:50:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 283EDE0CC8; Fri, 12 May 2023 11:50:21 +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 0172EE0CC8 for ; Fri, 12 May 2023 11:50: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 49144340CCC for ; Fri, 12 May 2023 11:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71BCCA71 for ; Fri, 12 May 2023 11:50:17 +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: <1683892207.4e08d7742d35bfdf3edf8632d65bdaff1292df2d.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.15.111.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4e08d7742d35bfdf3edf8632d65bdaff1292df2d X-VCS-Branch: master Date: Fri, 12 May 2023 11:50:17 +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: 5105fc88-7bf1-45ff-9812-f95754117710 X-Archives-Hash: fcf01db00f7b92bfe00b9769458e8836 commit: 4e08d7742d35bfdf3edf8632d65bdaff1292df2d Author: Michał Górny gentoo org> AuthorDate: Fri May 12 01:40:31 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 12 11:50:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e08d774 sys-kernel/vanilla-kernel: Bump to 5.15.111 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.111.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 60aa8f98af9d..00e736aee5a7 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -43,6 +43,8 @@ DIST linux-5.15.109.tar.sign 993 BLAKE2B d36cd5e599aa015fd5ef5a186c202f29a74a6a7 DIST linux-5.15.109.tar.xz 126567412 BLAKE2B 1a54ba11887436436bd999bf3f28b9473afd9dcdde7768c72c847451e0e2dbfdc56687c46007f91533f17ea98e84bedd4e6e3514ae26ab9d705b010799dd37d6 SHA512 1e0399b76d18722b1e4bee011d0d3317a536ee6d42774dd9456acb4e258ee36a4c54ffd251f820f28974d85bc85b7fb71c0e54b7b2ef9fc4e33b780eb8ac33b4 DIST linux-5.15.110.tar.sign 993 BLAKE2B e61ba633d266473831534e489c6fa77b4956fa2079750aa2375a45e7d1478a2259bf78f8d327fb62a2e91c7f63a887253323ca30b52f7f388dc9703739992f71 SHA512 bd2e1d2d960732c966da6d2f15b1138162d118fdc3f5cfcddbfef655204dfe95fd10d18f01be488b6dcf491a1bb99714fa01fd93f88aa3a22511b2ac24ac697b DIST linux-5.15.110.tar.xz 126540860 BLAKE2B 66196064d2546d9179277f01b0d56789f860626ebfd9c5371767c9c70434a2a258bba34062dce6c3b861349eee0a3b1659032db0a0c3662b658ab3e63c610504 SHA512 ff014bf69b0abdd8c538329d5a4f56b13424276730e806cbf0e439a2ebbe7b39dcbaa1b64b8a3e19a9af8a86338048d0d7925625dee3b0f1adc21be0749c5916 +DIST linux-5.15.111.tar.sign 993 BLAKE2B e2514bc633ce65d36b8d6b4c9f2e826f0d50284afe1af005c4aaf58786fc5ad5ec8eadfcfd67dd8bcf1a4026417f49d40706d80eeb084c1fb6cde8cabc5b349f SHA512 d6c1cd637540454f5e25312e2418a67f277c1b32dbd34e69728e42d0993cc4d89fc4d9456584100892df2e57f4283d1436e921bbf412d3df81d901142b3d8c09 +DIST linux-5.15.111.tar.xz 126541212 BLAKE2B 329650e5b90275105806b7d6810301775cde7e667afd52fcf0c82357a1bc055a07f651e0f41b9d4f992d239b61c0157cbb6a62e1207c8efdda3d0a7db9c29801 SHA512 b56e6f9fb6f968197d5bd593c4c68c000e2197dbeab748902775e481b075c5e0a54af0f72ec67cd53dbc8ea4c673efc9599c80bd878b0afabf43682532c44fa8 DIST linux-5.4.240.tar.sign 991 BLAKE2B a3298b0e17137892a663db0ce7c492a3bacb7b2b7efa44f92a8a4483a2b7985fcea9ad16f86e28ab7ba4ee1d68822f8e3941fcd45d5cc74c368cd3af6470b012 SHA512 ffbd9efc3d55f22219ed77d1ad267663c835802b13bb4bbd2d052394cbb9a1c7046e0232c24eb681f6ff59e067c7124d838c6849e6d5f0d20af57f8ea55681ee DIST linux-5.4.240.tar.xz 112999564 BLAKE2B 3be1fb581a205925c99ae91a7c7930beae48ec3455ba08554640c052cd4f972ea6d6a1eda14f0597571d6a8f83ca3a62d002043ebd4d6253e25cdd4dba383086 SHA512 5274e19c23b478ba2329abb20166d0b6d759d1bdf7030473f066ddf72e87c6e6ce8571f18d9803ed722f0884391919971d32cef606adbc19f10718fa2b29fef5 DIST linux-5.4.242.tar.sign 991 BLAKE2B 4dfb18636791da74779de3c55aa8a9491549567eb50a408f4a8a77d3d0d8e94a572b85f245fdc28362b557783b3ad804fd81c114c52a1df7919e47296def6a34 SHA512 632e7ef33bfae1595c8bfe375fdb836becfd03346c1ee4b46c503756eac0dd47f92d9a559887207e76ed54f1003a3e3ba92b9db15c645aacc2f941939c578baa diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.111.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.111.ebuild new file mode 100644 index 000000000000..f68caf0fd433 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.111.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.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +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[@]}" +}