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 817831582EF for ; Fri, 21 Feb 2025 19:53:54 +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 6DBB5343208 for ; Fri, 21 Feb 2025 19:53:54 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 71ABE110473; Fri, 21 Feb 2025 19:53:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 bobolink.gentoo.org (Postfix) with ESMTPS id 69C50110473 for ; Fri, 21 Feb 2025 19:53:45 +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 1B1A33431F5 for ; Fri, 21 Feb 2025 19:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD6912736 for ; Fri, 21 Feb 2025 19:53:43 +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: <1740167617.9573248a9dfcb00bb771d967eb5bce6b45a8b6a6.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.129.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9573248a9dfcb00bb771d967eb5bce6b45a8b6a6 X-VCS-Branch: master Date: Fri, 21 Feb 2025 19:53:43 +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: 4e1d869b-b910-4b29-9799-a92468505168 X-Archives-Hash: 5263daab18e71ac88432c1aaccbb1b3a commit: 9573248a9dfcb00bb771d967eb5bce6b45a8b6a6 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 21 14:38:04 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Feb 21 19:53:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9573248a sys-kernel/gentoo-kernel: Bump to 6.1.129 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.129.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 8f794b757e6e..acf657c24335 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,6 +10,8 @@ DIST genpatches-6.1-137.base.tar.xz 6788380 BLAKE2B 365778dab67485d413506657e7dc DIST genpatches-6.1-137.extras.tar.xz 4056 BLAKE2B 8a39c1f0b11bc776f301f6a750af6d7416a20231c7170f50080a61b40071a55f6d2906193d76d8fe4837b4b494fcf0a683a7325ebf18eaed6543c0362c78a6ea SHA512 9739342cd761efc0fb4b2d09f147d721b8099ec0594a0190a0f39fbb23b131068c6127be3b0083a1e60c4d4120b3437bab8b4608fe1805724e513890a0a46bed DIST genpatches-6.1-138.base.tar.xz 6804336 BLAKE2B 31d8912c815d4560b35bdaa4fc46597d641c63b693123ee34678c6f9e89a808e3d0ff90c762d601d2caaebd6194083cbf55ea34bf8df68157fb51cf9d603b766 SHA512 f72c533a8afdd81a17fdc27d3b5d7323447c81d70a1295ca1aa949cb1c5a469a1dd84fdf97f81cb2ab762fe6ae09716f3430da13378e4dc08d4511c6dfa81116 DIST genpatches-6.1-138.extras.tar.xz 4056 BLAKE2B a9205e4748d7892920c7428cd80bc8b4e8a8b86467dc8771b427b941c882af4de55b2d3c6450410a26ddbc0dd2e4df9a912025389379b0f02a20e7b0f2c99020 SHA512 50c042432612985dbdd7802004471f58bb7a5308b362df0ef903262214c116342817abdba2cef6b1f4f3ed281c62b50c19d4d0c0b43eae148a0ae870ff812460 +DIST genpatches-6.1-139.base.tar.xz 6935336 BLAKE2B 30d7dd358ce4588cb948cff480a33fde127c0fd234da3cdae2a34640f33aa4275e53cbebf10f5b80d69e59965245a77919dcbbbe61d541b37da5699e3adb700e SHA512 0693dfbd329dcc525a7565cf238b8f93bcd61c0242e7c05f6870f782f9efff2b0c79da4cf1514058fd76e7dffb6640b04506aa5753f1539cd62e7aaeaabf7304 +DIST genpatches-6.1-139.extras.tar.xz 4056 BLAKE2B aa22b3363e11a53ee35d0d4ec3e95b3bac0326a6931bf0a260219da44b50f7ea8da69c4525d0c96e24fed013a8fb9f8fbf0471ef446afb55ffff13b4c7f7cb26 SHA512 473d93d7065dfe9223493df37a04b1d1a6be9707e05501868341e6058604b96fa697198978214ce8e8f70e5ad4f54dda4e9241639c48001540901120ffb3d7ac DIST genpatches-6.12-16.base.tar.xz 1027208 BLAKE2B 2b1afff6deacca3df2b83a04a104271d167d37b4200b8396adc8a3751bb9f972a9442ad1a6aa7d9e8867a9112be1dfce236b0aa2d16f706520d586a736289a7b SHA512 5660c464c27586c9ab7b95ad5cd61cbf6c982e5c4a281cbb65e55cd562a885c4a9c5a79cf08373ea1b1f9757aeae1da00cdbb6c3bf559fcfcba0d9d380b45fbc DIST genpatches-6.12-16.experimental.tar.xz 78508 BLAKE2B a27156f113875d779ee4d5a382bb41e88093a25bb4d853690bde6b0817e5684bd14a65a1a19bb35813bfb00f5766ea699fd3415b53c2dde96b9dff6bcc9aeee7 SHA512 64b48effff1a0b4ec7e0d2dd8e585af862b059a2e0c83099962b54af548eb9778ef186bd93a7a2d7c4b5b91f2f375939b50bec79039e4fcead11b584cd48804a DIST genpatches-6.12-16.extras.tar.xz 4056 BLAKE2B 268700eac9cc0e309e30140397211d9fe614edb3c9a1208d8e05d5eff07f959ceee6ec7c68b8331df601f5ab1d81ab04bb7054513fed02a027e02b7c31e02207 SHA512 7fb9d6b03236370370528d28f4b4dea0cc132ba839ccbae80e31fc4c532f85acc2cd56e8a0a9f27ac7ed3497721f69d3ccba0c338be7e1d38588229202b3e456 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.129.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.129.ebuild new file mode 100644 index 000000000000..1009a9df0132 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.129.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=g15 + +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[@]}" +}