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 1B5E415802F for ; Sun, 12 Mar 2023 15:33:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CD13E07C5; Sun, 12 Mar 2023 15:33:11 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BC9BE07C5 for ; Sun, 12 Mar 2023 15:33:11 +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 30977340E3A for ; Sun, 12 Mar 2023 15:33:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1D088DD for ; Sun, 12 Mar 2023 15:33:07 +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: <1678635182.959d7f17e8258b794ff0a63f931ae25e50a46f6c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-5.15.101.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 959d7f17e8258b794ff0a63f931ae25e50a46f6c X-VCS-Branch: master Date: Sun, 12 Mar 2023 15:33:07 +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: 3d7e8266-b2c2-4808-beb6-a94faed973b3 X-Archives-Hash: 14556b3e7eb381690cba7b80c83f69c9 commit: 959d7f17e8258b794ff0a63f931ae25e50a46f6c Author: Michał Górny gentoo org> AuthorDate: Sun Mar 12 13:39:06 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 12 15:33:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959d7f17 sys-kernel/gentoo-kernel: Bump to 5.15.101 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.101.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 44caa12c4500..1d36094964e8 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -16,6 +16,8 @@ DIST genpatches-5.15-104.base.tar.xz 4172432 BLAKE2B 3056125f31757d4daf4d5a5df4f DIST genpatches-5.15-104.extras.tar.xz 3932 BLAKE2B 749f1d9446c12992266e4b24771cd4273fdb6a72793f3591956c33f210a2671d587f0cc04d0e9751511bce1e03b76df53e65231393e9d2eb1169ac825bd046e1 SHA512 66de4f74decfdb0f76050968d98a6cc378c04d5d19b9c16e35fa9746e9dce235c602ebe12fd19fc2b6bf8fc9d9eab3d9461e6aad3edc00cc465ae18a776b0e4c DIST genpatches-5.15-105.base.tar.xz 4208564 BLAKE2B 61c56a00ca87e33d7b566b319bba1e08e5dc104f2a5c21be61cb657abcc63d7b72ed88fae3adce80a6b648df7c2e715b9fbf71eaf0a43ceefcaba4d57e51707b SHA512 6ceed62dfac16a826451670771daaaaa47d92fc4971dcf72d486f802acbe111491bf01b1bcd5fca6f548d655a57bdf038a90bfc8a5ac1fe8d7796d90a2188757 DIST genpatches-5.15-105.extras.tar.xz 3932 BLAKE2B 7739e3d8459ebc58cafa0b95f7414e204a5c4410e468e11e27704bc08f32169a285baa6661289bf3d52602779d5e00eeafb84dba7847fa4154614534026aa5ec SHA512 28947f5bd2e49191fdcc46ccdde98a22c3e983a4ee6867c8d04458972ec3199bc4648374caff1a090105d05c8bb9eaa52e758b5d352e076c0a87967c659b8e18 +DIST genpatches-5.15-106.base.tar.xz 4208800 BLAKE2B 07fd817437b15b58e899eadd5ba2c278f9bf5f254a47ca4c702691072feb7c6bdc282de1c6b45ac16820dee4b5614e50e84a4869b66c037cb1be362259bf241c SHA512 453cbb424f0be467ff868a5dcf333dce3eca4593f961a90185d9d12bc54fb29fffce3b9b79dde7e4bd0e8c7dba1057c7b2821765976a6a1075b950ae9736c2a3 +DIST genpatches-5.15-106.extras.tar.xz 3936 BLAKE2B 37084de2c64502fe7825f54c2bacdbce1cfc325cabf68ffc0a727f81628d8ede4c4f38fdfdb780592e3e0e7d7df7609ecc1a3b17b7c5ee1525087ab6c02ab110 SHA512 95ed0181923ab92ad01646c792fdc1b3c2e6bad2e9bcf1e5bca3a9852fc2e7b65d66b84fb41d2360b8c3cdc7038e5558179b87799ee4f6e005eb72ff9b587708 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622 DIST genpatches-5.15-99.base.tar.xz 4024008 BLAKE2B 82205380a55439dbe6f8605d09078d7a349ec60180204ced6c9902f340077c800cf515f3f513c69110eab37a8daa386a82ec4ba9e84dd02299ccc45379cdc659 SHA512 72033d94d3d509ecefb5a54e82906408802118cd985f617ccf7465e23d19363668159998dadb950bef58af11bab448110e6c753eb6eb7dd107feacbda4d67f3d diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.101.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.101.ebuild new file mode 100644 index 000000000000..525ac2b652f3 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.101.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built with Gentoo patches" +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://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + 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 )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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="-gentoo-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[@]}" +}