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 9B3F9158020 for ; Thu, 22 Dec 2022 14:14:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1128E07DB; Thu, 22 Dec 2022 14:14:39 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 9720AE07DB for ; Thu, 22 Dec 2022 14:14:39 +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 BB78E34129D for ; Thu, 22 Dec 2022 14:14:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 042347E8 for ; Thu, 22 Dec 2022 14:14:37 +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: <1671718419.f64676a69a8f740d5482349002fb01fa04da8b3f.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.161.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f64676a69a8f740d5482349002fb01fa04da8b3f X-VCS-Branch: master Date: Thu, 22 Dec 2022 14:14:37 +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: f33e40b1-b4cb-4c52-a819-c02d920a7ffb X-Archives-Hash: 5ebc81824408529520cc0a726dfb856d commit: f64676a69a8f740d5482349002fb01fa04da8b3f Author: Michał Górny gentoo org> AuthorDate: Thu Dec 22 03:10:21 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 22 14:13:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64676a6 sys-kernel/gentoo-kernel: Bump to 5.10.161 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.161.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index fd74139f7383..f547549018f7 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -2,6 +2,8 @@ DIST genpatches-5.10-168.base.tar.xz 4500132 BLAKE2B c613cf38336ac3ba3b51af3308d DIST genpatches-5.10-168.extras.tar.xz 3868 BLAKE2B 86fdf10638b04700b3cf4fbd6ca570ba6fed2db16cc8b447f3661589c779ea25c0400538d79834814236f463c923f754033bef963a6f886ea447ce82349d5a86 SHA512 12f20ceb292d0f347778f6b65174ffbe0420e58857671fde768e1d14c7712cb2ca14f84f2e615ca8a2c2981495f2939f843d82dbf9172bef0e3bb7ac3257602c DIST genpatches-5.10-169.base.tar.xz 4503176 BLAKE2B ca2bf2e3fa51de6c261f94bf54aaa3e0d7f89e4caae3b0d8b0e7c202f5834c8488fe4fa1239b88f7f1e59dc344112b5633a2968a4dd2d811afb330934861c154 SHA512 2086d7afcd337d6fe029c24c8c8713fb1764627abb975f412009e8a760b9eba39944b86380ca70b8568f550ad8ae0a82e8cdc1474196d5f4edfe6ac02f458c47 DIST genpatches-5.10-169.extras.tar.xz 3868 BLAKE2B 40ec1739f6cd6cc27b4b5671634aaddd650293e361e3de8fe512652c9f5e7a314d1b9d73c652dca1b6787d24260aebcc8686cac6d85f031074400330ecd6ce26 SHA512 1a474298d6a77c5e1aa377bd92ed0066e2eaf0a978db3e2e444ce3f308fcc8043c7d5a9c23b7d1ef5cfb3a9a5b2a0d5d7ecc593b2b5db95b79ccdb95944d78b0 +DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c24438943dd3b583c25d187b5913a5308d41a7322a6467324be402b3748d201040b004980a5c6021704142008e49888d4898ec6194b2 SHA512 7b737194adc2876f589be2a155b1142a48353a099872cf1f75f653fe0c2fbb1899cee2c39970147c827c46ae31d5151aaef18d0a805fdb28d8efc0fce4c808c7 +DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e DIST genpatches-5.15-87.base.tar.xz 3545732 BLAKE2B e69eb4d31984b65ea5e0c216d066b358e6cd4fd9c8c9e021fdd3e5022fa6a9fc804b673bf4433d4b8c6f13aa3d0336f2976aeea50245fbc6640674acfc8bce3d SHA512 bb9ca966cdbd5ef5da3cf4f11038f03495e643c07b7d93eab31d484d5615781361706c54d82e42887f0e5e867e7b8c62f565cb57527a4056be2cb10f0fa19cb0 DIST genpatches-5.15-87.extras.tar.xz 3936 BLAKE2B 05717f3f9ccb161a5076c6623f15465729ec898ab7a8fb4e611d07acaca96df6b890a3af0890dedf6acb06c7db148df625fafeca5099eb96e31ae981e00a23e3 SHA512 ddda9d1daf3f71a8aade12758db2d698b2230a20b3df059437fba02b499d2a90f2bb5a5c0796b1fdf842ff64e515193ac97aa324a4047bbcceaf4849eeca2674 DIST genpatches-5.15-88.base.tar.xz 3548532 BLAKE2B 947258e9bb979febcca994f82b9ca18df494ac0d7db4664a96ccb4737ac71151f21070d30e4e5665c53d4c444bf06471590a14d17f83396809ee9013064db317 SHA512 e071daa0620c62e5ba273c6f5c4134f7c6f179b25a7dbc10e1f045b6becef1182e0f27620be0f03f32926d5c2109f7802335dea9caac1d576c47bf92c0532045 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.161.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.161.ebuild new file mode 100644 index 000000000000..c2fcac174860 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.161.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 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##*.} + 9 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g1 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/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 + 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 + ;; + 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[@]}" +}