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 E3C3C158021 for ; Sat, 29 Oct 2022 15:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B257E08BB; Sat, 29 Oct 2022 15:31:13 +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 0393DE086F for ; Sat, 29 Oct 2022 15:31:13 +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 228473411C0 for ; Sat, 29 Oct 2022 15:31:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 533D76DB for ; Sat, 29 Oct 2022 15:31:09 +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: <1667057430.6c46d98be4e7dc0b497902b421f1f3dd14f4da8b.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.76.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6c46d98be4e7dc0b497902b421f1f3dd14f4da8b X-VCS-Branch: master Date: Sat, 29 Oct 2022 15:31:09 +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: d5ed040b-f704-4452-beef-63092322deb9 X-Archives-Hash: bb00a691f3b35d48a28cf50fccdee8e8 commit: 6c46d98be4e7dc0b497902b421f1f3dd14f4da8b Author: Michał Górny gentoo org> AuthorDate: Sat Oct 29 11:31:00 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 29 15:30:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c46d98b sys-kernel/vanilla-kernel: Bump to 5.15.76 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.76.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index d68bd2d1ae07..473d2cd5e86b 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST linux-5.10.151.tar.sign 993 BLAKE2B 5c17d3eaa8bff5da48325f4441baa22255169d3 DIST linux-5.10.151.tar.xz 120536380 BLAKE2B 5f331884867370d34a9be311f68c1e640733f6d672f08fc3148bba3861ea1b252be79ae287e9f8e79a4790ecf764baae469f921297a2da8ff78dc85b98bcb6c9 SHA512 c32923911ce5c17d1ef214e5996cabf590770a389f035555bd2579eac0ad60f44df18ca59f11b212bffac4d4e775d569f9cc6c4a795804c26fec21195c06dac1 DIST linux-5.15.75.tar.sign 991 BLAKE2B ca3ab657a1e6d98d2f8419c98c5f41beba2cba0bcbed937c4233bf8d3222b362bd973b435bb5fc987ce9e9714dbf6ddfc2265c7ede51196d66df0234d904fe7b SHA512 81b5b73b910babb8a7b3d060c3f826f3da687fdbb8cd83fb55848238f052e035677549ea59f41636bda7dbe1ee5949e043c70e0c3d501ba1b09e5ad4e27191a3 DIST linux-5.15.75.tar.xz 126466096 BLAKE2B cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9 SHA512 6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6 +DIST linux-5.15.76.tar.sign 991 BLAKE2B 876831fa3e2838bcc1785ba8a8231a5a50dbebe587105ea892e16f82a513383b8c920cc8c1025728a3b17d430f861b1c9671c544c5597b47a0ae226d79f1466b SHA512 4a6f18f6ac9f3ee3668778bfa1b1288f78b865fb6e39d20efb65604707ec0260db5ea4cf90b1705672853e3997e1cc8b775439b86925b7c4e5cbcf343a4bee1a +DIST linux-5.15.76.tar.xz 126460932 BLAKE2B bb7f6872449889d928174f49ac23047e62fd6f2076b976abc6841f453a8eb14c0c2fc634e30ba921838e28c57ed0fd06e28a1192fe3855f82aaf4f2a8ec8ae99 SHA512 de8466371030827acbe44d8e62b0322f86cbcf13ea90f9540439798ad8bc730f2bd63f62b031eec2002401c81756d6e0a83070e079285e89d416a9360eb328b1 DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798e192db40be092b7da480f326ea3898afe0b461f68e69bfbeb7cd5547529db72cf338ceeab3d111bf1b36ad6f SHA512 30d3a3e76be9327658391912720275c2a63ba1bca193b03989535ce6af1d8fa958a52abbb5ca9b3b614fcec88d547a4a0fa209eb738ed5ee90605517d74bc458 DIST linux-5.19.17.tar.xz 131698200 BLAKE2B c672df8169c4b237b00759510fa5582089a92129bd60cb712faa94a14070c867a821aee088ccf75df136a728ff71a3fdaa3aaf4baebe9aa62ea8ad15ff5bc76d SHA512 aa1b471be303cbe470df7d8b681144f4352f677bed27b98056477f24c93684f8fc4e45bf91611b38f4798bacd3568b6e4bd3eb7641d618200815953ea05f441c DIST linux-5.4.220.tar.sign 991 BLAKE2B 6296bf42826c849af68331ba32a8e84c892b54f299b9ee7b84ade2d52b5773a3488f189de1f4f7e2580a13bf8ac4af256b0d18fbecc9ed9a69bf1a1a94aa89ff SHA512 21c05e660eb0f55a2138eed952ccda9860ebffbdecfe81240c89ef32904f060aefd7c01846d614de6f1dd30986f0eab0ac85f2c31b0805f4bc578ba83ca82ab1 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.76.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.76.ebuild new file mode 100644 index 000000000000..e9d460c7094d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.76.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 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=g1 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="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[@]}" +}