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 749FC158020 for ; Wed, 12 Oct 2022 14:52:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3432E0948; Wed, 12 Oct 2022 14:52:41 +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 C5C39E0948 for ; Wed, 12 Oct 2022 14:52:41 +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 7A0C234107C for ; Wed, 12 Oct 2022 14:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5B22523 for ; Wed, 12 Oct 2022 14:52:38 +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: <1665586348.e5406b6b0982f41ea55216e544f218e056cbb233.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.73.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e5406b6b0982f41ea55216e544f218e056cbb233 X-VCS-Branch: master Date: Wed, 12 Oct 2022 14:52:38 +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: 7c61e29f-70ac-44cf-b65a-f31e8f4bb262 X-Archives-Hash: 578d734113cf36c540e8adece2130df8 commit: e5406b6b0982f41ea55216e544f218e056cbb233 Author: Michał Górny gentoo org> AuthorDate: Wed Oct 12 12:39:50 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Oct 12 14:52:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5406b6b sys-kernel/vanilla-kernel: Bump to 5.15.73 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.73.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index f807aedb80de..25c835cd352b 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST linux-5.15.71.tar.sign 991 BLAKE2B c68c1e6ccdeaa6b7c655ff850b50c69cb2c72fd8 DIST linux-5.15.71.tar.xz 126446412 BLAKE2B 77da2393a31b6c6fed7cdfef61a112ae49fcdfce96968daf8c7a690a6e65025c7238c1fe084d0bfda403dc56db877b6db99def12803e840cacf318da40327d7b SHA512 7d20387a1f82d7ec63ff06ed05885a2758b39ece0fe95ad559d79216210e342f0df4dfab9f54c1e4016c331516034aa1b6783d63dd7e415d0cb20947301f95ab DIST linux-5.15.72.tar.sign 991 BLAKE2B 90bc5b088ab8c44f9b8bf96934547b07090f9dc27aa1f8a18cb028fc17f2638107868d678c6f80b22025b9093c653891de2bba942fac049f20e62eb2498d185a SHA512 310a5b6991ded25542e37112125975dbe1dd6eeb1f1aee8cbce18ba4ca16892d88d5c56bf6bb55ad5bd094fe9a9b6f5d83cae8586d07c3b8a67eaad889a1b05f DIST linux-5.15.72.tar.xz 126456132 BLAKE2B cbcee67d4d96085f954bee66e5270c36587b4407db2b66ae7ba6f514e3f1f09878000cee18984bbdd21aaa1278ad6b47141cfa50a0a5e96c921c5371e90319a3 SHA512 c6288f664cdc02711382592493c84152f2139b8aa0cdee7d448c7aa75363028a1b7ade15414e7d9d42501f754a6d8eaeeb2dc663ae3b3cc95e9d0882d5aa8d1e +DIST linux-5.15.73.tar.sign 991 BLAKE2B bddf3d467612809564144f139e09ee0fdabb8756d99476d5ae65a307792ff42b94964b94b35afe2ae8baa13f3b079aafe9c080121a9b8f67a335c767dab6f407 SHA512 bc82810d427deab2ac8a5b12f18c1d98290744ceaf5755156dbc9e604830522b6cd0a615a771cb9984746716f17e51c548c6a264a589113afa565b8971655452 +DIST linux-5.15.73.tar.xz 126444132 BLAKE2B b8d9276aade33dc10069684dfa806716ec3bdde24f9f0363709011f6e071fd909669f7dee23f1b30506ac46230f2da82cb66e63d730fed6be430406c508bcd3d SHA512 d32f8503c676c713211c5818eccceaf37e6f78ca0bf6269b194eafcf515b2fa6238656165d165946a758ca86d9e60c389c23d05e3c85fd6716003e5f19d05f6d DIST linux-5.19.14.tar.sign 991 BLAKE2B 33280f855e00b93f803e6f982b129e199748925f5e3326d977c81a56bad08d7d6dfe762ebd1bcdd535fc64c6af5981d39ffc6a49827f984d69a5c9bd72ae02fe SHA512 1162461100ee335a73f2495ef456ad32f1bcdec400dfc52fdbdd14929e2f1a87b3527f57c1d7ea08957c2bd607d89aff055e0faf6abbfe801f32ce93d9bca88d DIST linux-5.19.14.tar.xz 131644196 BLAKE2B 459f07c79b36b9edaff06f4fb183bd209af2e51c968b2ee2883f9664eac1cf569b59e3fb9b943c1eef50362af3a41603ce367df1895a1f77571ba491160131fe SHA512 19e584735009f0cedd08c94b2cc75cb6b0706a5aacd13a57995cab4f4a304bec42e9f0151bac1712d117b88c211fb84092b6eda723f9ab06289f37930ce1079a DIST linux-5.4.217.tar.sign 991 BLAKE2B e013f0bdc76cd45a30b9868daffea48537cf6c11479cf1622cf062f52400b4c9b02aa7f963ec7f8d977c32a012d2d99cb8c78e7c07f165b4479b5f4c306ae70e SHA512 99e380d449b8005c721d6150b42f8424a4b034ed61c21c3c6c5dd488f42837d064690e448c3ea03aa08928597602605b560d629d44bac44f09b67f129b7e4866 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.73.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.73.ebuild new file mode 100644 index 000000000000..e9d460c7094d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.73.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[@]}" +}