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 530761584AD for ; Fri, 02 May 2025 16:01:22 +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 3E013343082 for ; Fri, 02 May 2025 16:01:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4BE541103DD; Fri, 02 May 2025 16:01:08 +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 476411103DD for ; Fri, 02 May 2025 16:01:08 +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 EDE19342FF9 for ; Fri, 02 May 2025 16:01:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37E34266C for ; Fri, 02 May 2025 16:01:05 +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: <1746201646.c8428a01c7bb4884bb83be0c240f5a1e34c007cb.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.136.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c8428a01c7bb4884bb83be0c240f5a1e34c007cb X-VCS-Branch: master Date: Fri, 02 May 2025 16:01:05 +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: ba4b9d11-c58e-4c61-b0cc-9db16627f9ad X-Archives-Hash: 1d4e28761a051cfd7ac179beb9d7f190 commit: c8428a01c7bb4884bb83be0c240f5a1e34c007cb Author: Michał Górny gentoo org> AuthorDate: Fri May 2 11:24:02 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 2 16:00:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8428a01 sys-kernel/gentoo-kernel: Bump to 6.1.136 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.136.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 619a6efe58b9..74dba36e9251 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -22,6 +22,8 @@ DIST genpatches-6.1-144.base.tar.xz 7114872 BLAKE2B b0d4ca8212af006ac44e8d387a65 DIST genpatches-6.1-144.extras.tar.xz 4056 BLAKE2B fa5b5195efdff3877d86d523f199652fee8626f43c7a4459e5dba6ebb7411a38df44f943d03bb9bc8714d58db9bcda99b22ca6c3a38d35a76be300ae7e48c31e SHA512 74859efcf03e6135309277c84a696f88a94153356354313fab6ae6610d1cc86a61c6792f32f0059a9d0a29a53ed6a93b186010210f844f32590c50b8f4b70e6d DIST genpatches-6.1-145.base.tar.xz 7182576 BLAKE2B 935a9701f0a0a84a286f0287607776e174fdde7d5ca63d8adb40acd948e6edeef86874faeade940f78243986fce43b8267ad96bd264e752944eed89bfd958250 SHA512 9be46933d8d15a303ab5f5e11a056c032c0ba136b2e3c74e21e90c62645c9c9c987698c74dd723ed79c8dcccf2cc7c3831a2234dc8be735de2b257106a52e8ba DIST genpatches-6.1-145.extras.tar.xz 4056 BLAKE2B cb630e4721aefaeb4457c17e589e84bf010609cb498ade5218846e5bc56f3bab79650a620275d47e393ee128a30eaae8c9337c3e485fc8540d812c77138d6f8d SHA512 3304dcc7bfa2a5f0c874611e1ee779461323746d4b54a11fbb446393e523a93718feb76c9ae791b7c737f29ca9d20768b4c6ad4827480f939748346dfdb3fcc1 +DIST genpatches-6.1-146.base.tar.xz 7216868 BLAKE2B edfff9d3be6142527453263c896f9a486ca7db92129e264d8de50532d069661ac57aca319f5acc80d11177eb1b5246dd78e3937c66ac01ab57b49de98625c3e9 SHA512 2dc2fb1fb062cd7bf54c05404c916c616ecf8fccb397c4018804dfb50f800a3815c9290cfa67cbf7d18c2d2f79ccab2131f50261cefe43b24a62556409979988 +DIST genpatches-6.1-146.extras.tar.xz 4056 BLAKE2B fd78397729f327b395213e9e6b2bf8160416285d52237da424aac4fcd78160974d148cb15a66b37b8961b7734dbf57c4b426098f409c6606f763ba439d04ec72 SHA512 54c601af719bc21f4230c93e83e51018745c20ae8319e5234c22cf9dfc6100d30c81ba464a154aebda2c977be40246621c2d4f0ba4f4d20a55789a73401d6231 DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B 818643d9f5ec5f4edc3cf2360f75bcf213ca99846e2bb96721933fa1785624aef8ae5c3ecd3af4f2e13e0cc44fed86e2d1cad8b53ed45acddcb9d91fc483c20b SHA512 746f4b5523fc3ebb3c59211c7fb4a80714e6068ab769a001c044ad300621b5a4a7a0b0b06c5a689bbf382cb27098f36725962bafb4d6e4489ab44cdb19b6ed1d DIST genpatches-6.12-25.experimental.tar.xz 78504 BLAKE2B 67f29383edfbcf8ee219d41e29534ba1ddbbfe7f1ec31b1227dc0c9fd45dbc4c0d101633f1d9a7487e4b2783adc040dd8b8a17b4d5f9194633e2567f05e72bf1 SHA512 306687dc70fd7e268941c201f40953df7f93ac92e1de91746d3cfe938c0a53761e915365cb2ccf91e97a9d583233b6567f2408a40adf2f38d00c06e3fabb043e DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B 2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1 SHA512 d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.136.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.136.ebuild new file mode 100644 index 000000000000..6ef9cc2daa5d --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.136.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[@]}" +}