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 D6DCE15ACFB for ; Fri, 14 Apr 2023 02:24:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0D56E085A; Fri, 14 Apr 2023 02:24:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 C89A8E085A for ; Fri, 14 Apr 2023 02:24:52 +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 DE183335D96 for ; Fri, 14 Apr 2023 02:24:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8305A46 for ; Fri, 14 Apr 2023 02:24:48 +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: <1681438737.b30138de9deaa40013dc26cd1baf87963284c8ff.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.107.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b30138de9deaa40013dc26cd1baf87963284c8ff X-VCS-Branch: master Date: Fri, 14 Apr 2023 02:24:48 +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: 1ec4d947-cb62-45e5-b118-2b10f88798e8 X-Archives-Hash: d99a30b6d58345023e276462ae75abbf commit: b30138de9deaa40013dc26cd1baf87963284c8ff Author: Michał Górny gentoo org> AuthorDate: Thu Apr 13 17:32:30 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 14 02:18:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30138de sys-kernel/vanilla-kernel: Bump to 5.15.107 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.107.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 2019dadf1020..1cd8eac99b47 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -52,6 +52,8 @@ DIST linux-5.15.105.tar.sign 993 BLAKE2B d3ee71e169ec78ec8a9a5c3579eaa504319c37b DIST linux-5.15.105.tar.xz 126525736 BLAKE2B f0175a21ada81910bf4dd176f1c6674244e8ed9294f4e19e89be73ae12e91c183479e0e0604c9c52c48f2e549ca1d4e01c5eb32a2333aefc82be8bf4160befed SHA512 f133d664431b82d995442878a155d77c624de0ccc02704198b5db27e170d55c3759f88091279cf9d91f717326b5304e0cfe0aa8253ac5d89bdeb7d6ab344b3e2 DIST linux-5.15.106.tar.sign 993 BLAKE2B be0eea3e6c2243f6535e330fa93b87440ea45a40b28dfdb5b6de72567abaefc2393542aa6553a08ad03c82774ef4099fde4d4c71fde31b33a21feaaae263229d SHA512 0a11a497ddcbfe0aab7d1af38c713e00624805d67e24caad33ceb7869ea129017eebb570d5590c51b13b1571c4b0ae6480a3bc5086de6ac713cf0165ac348889 DIST linux-5.15.106.tar.xz 126528672 BLAKE2B a7fd77e1b85edd22b3b45d3b19d103897b89c6253fa1357a1897dc96c793b8bc9652ae8c5a36ed0a4bf28d2a803dfc876decd7ddcc4adbea51bb76476d4fd71f SHA512 4cc6ce0edfcf319091fa271b0e9f484bad5e46d6981abc0b691ff85c63577497b6f7048309e082966eebea1db2a2e7fcd7a538e8e93d1a37a9dbf533514d5077 +DIST linux-5.15.107.tar.sign 993 BLAKE2B 917d11ef8c99670e556d31faa26743ad89ee3a6c5233e8f32ab83321dc91dd96f367c5fdf8354fba69d862d8c724fbcd68983b46a934fb923923796f661415e3 SHA512 4045d8339c1248c181df20ea58fcd92ed431b7038d0db4967d50892eea01a3eea8094a076b9705a7f315fcf0fa665b877aac90bc90218b6db00fc5d963b3e54d +DIST linux-5.15.107.tar.xz 126519572 BLAKE2B 0986cc144bbae9321ace74f63e57a3399776fd5858b23f172b90bda63f89b9838ba71d0774d255c6df8a0c0ee35db71c4ec2aee2fef0be81d3d7849fc70ae64d SHA512 d309b0e60e640f70f23ccadb48d22401a8a8887912e3898ed7674a398d30384377956c596808ea5fbb2b2436e54424a1893cfe6df5e56ccd0014a2bde1c66274 DIST linux-5.15.94.tar.sign 991 BLAKE2B 648f4c183bf955ee25efdb575551ef1e9c20e0b3e3fbe0ae5cf5d1c08cf5b4bc5b5a6cce603f3f17d9ddfce976fa42b480f93ac8ce2ee6f64d5ca11f56e899f5 SHA512 ab6eaf5a44df0ce2dd7ccfa4c72788ac212ef42eb1c4d8464f59b73638a08cf5361792e6be5fced152343f4c278e45379e76659a96bf623e7da33f13c3b16133 DIST linux-5.15.94.tar.xz 126497028 BLAKE2B e300a52339b587f58315fbe49ee3a856945b2ee34d9f367c67ba42234875de318dad8bb5f2ec35c7309c91a7b3d4c43d36fc8fbbadaa3b68e6c8e10014dffdd1 SHA512 7ced15a23345dbf17f51a8ccaca78559acfd907b9fe811bb44a9930ae2f64c528db61cc1276fc0e44ba1c76b4f5223145d3ba7fc01924f38b629eb868492b6a9 DIST linux-5.4.231.tar.sign 991 BLAKE2B ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d SHA512 31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.107.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.107.ebuild new file mode 100644 index 000000000000..f68caf0fd433 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.107.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[@]}" +}