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 926DA1581C1 for ; Thu, 11 Jul 2024 14:35:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EABC0E2AEB; Thu, 11 Jul 2024 14:35:34 +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 513ADE2AEC for ; Thu, 11 Jul 2024 14:35:34 +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 3A20A335D6B for ; Thu, 11 Jul 2024 14:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F5631E19 for ; Thu, 11 Jul 2024 14:35:31 +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: <1720708509.9b43ab96c22ee20c7027d9f12cb13b3fe27b6afd.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-6.1.98.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9b43ab96c22ee20c7027d9f12cb13b3fe27b6afd X-VCS-Branch: master Date: Thu, 11 Jul 2024 14:35:31 +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: adb7c939-1a21-4fda-a57b-5663ec001544 X-Archives-Hash: 6add3a8c9fc03b1d23da32d187fe8df1 commit: 9b43ab96c22ee20c7027d9f12cb13b3fe27b6afd Author: Michał Górny gentoo org> AuthorDate: Thu Jul 11 12:02:02 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 11 14:35:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b43ab96 sys-kernel/gentoo-kernel: Bump to 6.1.98 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.98.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index e8d0f31c84e7..1887b8c2f236 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,6 +10,8 @@ DIST genpatches-6.1-104.base.tar.xz 5452728 BLAKE2B 49a8765789436c1bdb34f72e8652 DIST genpatches-6.1-104.extras.tar.xz 4048 BLAKE2B 526ac16b6ffd987dd4f87797eeaa4ab1d25a8f27fb5b924f13651330abaa2a29bcc4d7d56d5be63b6d8f1c25c8f3205fd51ddbef1b324de89f67731271b24283 SHA512 3fe90150711eec1c4277e6b4cee2599e97edf0902ec7efae1ad836ccfe62233e2c6944f7abc30042e7dd5985ba1f8a986bc3de086739f5a8b64d18c2d7025742 DIST genpatches-6.1-107.base.tar.xz 5516960 BLAKE2B a4c1128db49bc5dec2aad2999279356c5c9578c8a7a1bd30c6896392da116325a81937ded85fd2684f206283a34fa3247af17ede459d33717cea0a58444760ef SHA512 ac371501c5a7e7e1f7ae2325aed969e2bb2788faffae6742f08836eb4495a21646d6875125957703fd2225066eabab9034022cf27a63c026ff02cbfcc9b00f24 DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B e37572e0575345470b87d07d8e3a0a7e8f7284d9ebb987152232f5a09c54508da833d60982cddce2fe5997e2791866b61a07555f631ea75c130d094bb5ed4925 SHA512 b0f2f6758677b163da436205f7493932aa925854446dfe1f687f829b0ef2d53b371992bf2001b217a0b4ec6c236a99833c98f168b877df45aae6819e39d0598e +DIST genpatches-6.1-108.base.tar.xz 5541376 BLAKE2B 59ef9110b100cf6064c6c6e556bec827138f44dd636d55a976a1ec4af4699f95258962ce272867a1bf172b6a2e1d4f7b25025d5b6c48c9c6c7a6d8f13834b297 SHA512 f250359fd14e11ee176fedaf8bff84a553a7cc559e56c29fa2b6e04217d4e1a63b072e1c73a021a527e37101704b99136e06e008553220d7a35eee3848aadb90 +DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B b6ad898a5a66a1a6ef293bc4a4a886ea29f0a1f985b3b85beec7c4e935e90ac9f642e7811261e413cc39b5a0ae36fd257d0afeb4a9c52aa29956070b4b52c50e SHA512 6fbabfbcd35db0dd77da03c138a6a225f7255cc3566007368ee759ce154f23f11edb8434be82992f153deab19c6b5549d00a7cfd54c4d0e49eaf2e4d39b86597 DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111 SHA512 6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37 DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B 0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc SHA512 5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B 117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376 SHA512 e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.98.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.98.ebuild new file mode 100644 index 000000000000..40d129f75827 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.98.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2024 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##*.} + 10 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g13 + +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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( 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 + ;; + riscv) + return + ;; + sparc) + return + ;; + 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[@]}" +}