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 EB787158083 for ; Wed, 4 Sep 2024 20:33:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEDAFE2A8E; Wed, 4 Sep 2024 20:33:29 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 9F958E2A8E for ; Wed, 4 Sep 2024 20:33:29 +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 016FC343074 for ; Wed, 4 Sep 2024 20:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AEF9D1F42 for ; Wed, 4 Sep 2024 20:33:24 +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: <1725481995.203f9f9eb52f3db243c18abb72672282a9ad5b64.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.10.225.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 203f9f9eb52f3db243c18abb72672282a9ad5b64 X-VCS-Branch: master Date: Wed, 4 Sep 2024 20:33:24 +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: 4b82b706-6d91-49f1-ba33-3062ae922daa X-Archives-Hash: 9b1d178fe3699dad5d9aa603428f4758 commit: 203f9f9eb52f3db243c18abb72672282a9ad5b64 Author: Michał Górny gentoo org> AuthorDate: Wed Sep 4 14:16:04 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 4 20:33:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203f9f9e sys-kernel/gentoo-kernel: Bump to 5.10.225 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.225.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 2523ec267f09..4ffac305388e 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -1,5 +1,7 @@ DIST genpatches-5.10-235.base.tar.xz 7367252 BLAKE2B ea3261b363e415112f0a13f4666dd226a33ad12962d481532875e7e8551ef739a55ebfee344a299368b3cc48cb1c2a465fe4151ec708983d1daa70f9d36f849f SHA512 bedfd9382d35a151c0b7ec102614d8a1f9866876ff4e308867803c32416db31d34197c26b6dd781c9a0c994e49df33de943975cca8ef9b99680916f2cdf2f325 DIST genpatches-5.10-235.extras.tar.xz 4056 BLAKE2B 6341fe389c77377eef465c9a92587bf370a56ecbbb65ec99eb2002e1e9525ad6a6fa1aa60f7ea28b52729a4779e236c706155f98a336358d12d1bf4c80381660 SHA512 d14506f3b69069682ab736b96116e58420974b77d99a22818601af7451aa07ee564dad10bef321f288be4594b6990b25521518865fcb111d9886aa3c1681f977 +DIST genpatches-5.10-236.base.tar.xz 7402184 BLAKE2B 24f0283c2dcc8c4854be2b70018143df53d090df3be31f7a17de5a8c2b2a342c864b3f610af9de1dba3046a5ab9ca7ab5460673be55d36d88dcda7c384d08231 SHA512 1993249aaeeb39905846030c652bdb9c4437e43f6fa5fcdc87f6578f8583cb500aa2859c9b0026cb45b25319e53ee11526a16ab1f322aabbdf3d3b9b5da36b59 +DIST genpatches-5.10-236.extras.tar.xz 4060 BLAKE2B b79eccc56c3eb9c3dc96ae67d22f4fd5144ae9c00fd948a31f6f6346bd76cb04933578bb22234e698b94f0caecf5e4fb3b57dc2190d5e87f017e19823cbefc90 SHA512 613f3fb02ff10f2320a0bf7861763f3d06c48b7f3bec0925d8d5e341744cf0c2c6396c17c277a4e1d5ea45fdb5fb88845bd5b6975749274e67dcaef183b7ba3b DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e121acf4a95d130866f37ac0113a8697df1996c13bbf65e14f4a5703f7bb3f4dd3ebfb29e258ca358d191c0580a7f8e61fbf7c0c SHA512 3fc49566b23ef50590a3b9f90eb99558c9e37847259e0defdfb0ca036c37b7f45c4989d58787b8488c67ea031114173319346c1c17799680ebfdc581ae7e4588 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041 DIST genpatches-5.15-176.base.tar.xz 7318820 BLAKE2B b7b87fa0ff1bde133cd721f87599163aa4609b3416677850fb30cf2b7afafff316bd50ba7301e658670c1abfbc81c29a0a40dbf1d8d6d2a7bd016f7a27bd9c01 SHA512 d4e5df70d7c28f0f39eea7b88fb27d76d4773ec41c52021b87cd2e84578dfb3421c641fbd212fd2f8961cb0dbb7f1e6237f13c5a3a1c348fd777eedf88b70ea2 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild new file mode 100644 index 000000000000..c8b462be8aab --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild @@ -0,0 +1,131 @@ +# 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##*.} + 11 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +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://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 +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + arm | hppa) + > .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[@]}" +}