From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46C0915807A for ; Thu, 05 Jun 2025 17:28:03 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 30FA73430F9 for ; Thu, 05 Jun 2025 17:28:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C2D6A1104BC; Thu, 05 Jun 2025 17:27:35 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B42381104BB for ; Thu, 05 Jun 2025 17:27:35 +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 63615343163 for ; Thu, 05 Jun 2025 17:27:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0012D297C for ; Thu, 05 Jun 2025 17:27:32 +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: <1749144441.2451cc0166c7aca72ecc1eef50569f7e4b2c761a.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.141.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2451cc0166c7aca72ecc1eef50569f7e4b2c761a X-VCS-Branch: master Date: Thu, 05 Jun 2025 17:27:32 +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: 66ad0079-2e58-4b02-b7d9-9a24e9ba0f3f X-Archives-Hash: 12963eb7f60407c09a2c944f21b18fe8 commit: 2451cc0166c7aca72ecc1eef50569f7e4b2c761a Author: Michał Górny gentoo org> AuthorDate: Thu Jun 5 14:47:21 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jun 5 17:27:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2451cc01 sys-kernel/gentoo-kernel: Bump to 6.1.141 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.141.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 28535faf94c8..9b34cc4f11aa 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -8,6 +8,8 @@ DIST genpatches-5.15-195.base.tar.xz 8297016 BLAKE2B 0cb4e5da03682a78b41e38de789 DIST genpatches-5.15-195.extras.tar.xz 4056 BLAKE2B 3c7999a16ba1a5c3f84ecc0edd1fa92c4456201f582185eb954a38ec413d6ee4f77fef6bc9807372ebacc197f5d03bc1eafbbc113d4c44c60862568954e85a46 SHA512 3c096445a11a49c3f0547f2a51c2265d21b2f0d6b9ffd084faa90034e4e2f598e422f9d612fa47a474d420e2d9f4caa8e5d1b818d8e1276930865e4ad85a6bb4 DIST genpatches-6.1-150.base.tar.xz 7305232 BLAKE2B ab1cc6541bda8af60a3aa5a9cf58a47ec3d0f5ab84d79cd557f4fd71b0c43984068300d5df18ed3f7e2b3548c3b3e7712f6c6c6c767f23de9103d7138e9e500b SHA512 9ef78029cda981e733b6340079bf37ebabc86d97e5d7974b0bc5b39ca90744beebb06aafc6a9b35ede5bd75657d3161307dd4d85b9f80907854488b3750b2699 DIST genpatches-6.1-150.extras.tar.xz 4052 BLAKE2B e268be13305885933ddf6b51953488c134f5709b824ab06921577788a7c77f687e87699b0d75148af3384be8d5cc00dd0c0633fe8edfa2096eb733f668656cea SHA512 6a656b40cd59fd788f0faa9b93ec33b8a48b11014f83b2a0ba52288ad88101cb7a40cb3168fc6a502da93a2c79972c640ad37a12b4ef2485fa7001a963e491a6 +DIST genpatches-6.1-151.base.tar.xz 7402608 BLAKE2B a7f5f902d84b19d48a26e1c00adb3d6351c8001a357b87e7012817dd4b568fffc8b7312873e5baca443f79f42e90e5fc33f6a949020ee431d82803ee219935af SHA512 e1806dd94379d483a99d76a2cdcfa60d304dbffb19c4b7e17c38118f1df0926df7a0c36824b5398798bff86147c2e557aedd35dc828ff17d53dfa8324171a25f +DIST genpatches-6.1-151.extras.tar.xz 4056 BLAKE2B 79dd87d35c27163057edabdd6d605777e2e440aa5e4d4390162e0c3ab2b083848ff7c0cf92ed83c05e752c26ba22e8e0c25fdb3e040ca9c5d38870756094e84c SHA512 28876cc7c53d3eecf2d01840f89501693df6c81c5c139b5c9f6ace64c8e578b1998aca476c55ee44d470de84085e6bd6362c55b60d4fa2721a8046c2512b5ef7 DIST genpatches-6.12-36.base.tar.xz 2240564 BLAKE2B cd68b5d7fff73f5fe0c67a8eb47c2094a0ae57f304b5a4798ccca7410c5f514fc1f9b2fccb65e639886e48950ed24d04ed44ddcdff3d5223e336f573f25a501f SHA512 61796173e1e286c352d3d683be007e4336e646cc1efcde0528b12b38e484d104c9686440aa90d096cb1ebadc715e46899e5bda0f8bd070190ed73e0291401f19 DIST genpatches-6.12-36.experimental.tar.xz 6048 BLAKE2B fac20aa6031bd73641bc89ee2ed863c1fd1232935451626ff1f3c5e5e800cba20f76101ee607dec04efebf08310e880c45e9561a44ec3afcbd745a998667933e SHA512 8a98ee5736f57e5b9ada6bcbe39aba99393f6d76f4cfcb1deabff6e9d802895c18c8daa477fe422b87841bf3b815e43ab7fcdbe0bac8290d9962aecd602d63d0 DIST genpatches-6.12-36.extras.tar.xz 4060 BLAKE2B 034e0d065982369815db90efd84209bf88c73d19a1f4fa41b6c4586b0197e1e502df00b63f8d99c7c1eb0e32fbf99c0187b8c304adaa0f2f624a722e50a31b21 SHA512 cfbb8e69bf254088ddee442c6ee1d293406eac106b0c8fb7d926ea2778260664991ca05c5efe6547b4740ada1010057001856c5d6ee864cd73f55cd8ef78d5fa diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.141.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.141.ebuild new file mode 100644 index 000000000000..6ef9cc2daa5d --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.141.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2025 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.102-gentoo +GENTOO_CONFIG_VER=g16 + +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 + arm | hppa | riscv | sparc) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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[@]}" +}