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 35FF1158020 for ; Thu, 8 Dec 2022 20:24:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F41CE0896; Thu, 8 Dec 2022 20:24:15 +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 E5C4AE0896 for ; Thu, 8 Dec 2022 20:24:14 +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 C9580340E6C for ; Thu, 8 Dec 2022 20:24:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA65977F for ; Thu, 8 Dec 2022 20:24:10 +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: <1670531041.45e2259b315b15e593f9b0ae340ce81c6456ec1c.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.158.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 45e2259b315b15e593f9b0ae340ce81c6456ec1c X-VCS-Branch: master Date: Thu, 8 Dec 2022 20:24:10 +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: 1f2e3e67-512c-47ac-9ef7-54638852aec3 X-Archives-Hash: c423b154ce41ade251a8fcf785564302 commit: 45e2259b315b15e593f9b0ae340ce81c6456ec1c Author: Michał Górny gentoo org> AuthorDate: Thu Dec 8 14:16:33 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 8 20:24:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e2259b sys-kernel/gentoo-kernel: Bump to 5.10.158 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.158.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 1fa90ef793e5..fbf4069b12cb 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.10-165.base.tar.xz 4410392 BLAKE2B 67300432c6ae3009843c2dbdb51 DIST genpatches-5.10-165.extras.tar.xz 3868 BLAKE2B 1cf0214ea5d61c180a97e99697889bb0ab5b1e7a3a7c0f3c3492e9de424af586975dde56e9d8d24c0222f88872d27cdb763c02cdb64e293e755a6ea107e22a23 SHA512 b1a18819991cbc9265bd0aafe0ad4d20402efd6e96c7d68f509bdec0177cc4509d9f71b8dc41b906643498ebb9f51721df31fdaee6dd69652c01237fcb69717d DIST genpatches-5.10-166.base.tar.xz 4458748 BLAKE2B 6bd32230b72d16a642c85296918f467d181389087aea84dc1b6fc922c3091f444169f15461a438480e90de59806e0f0cb50f51ca40a590369fb1ae28d48018d1 SHA512 8897cb2a53f226e40193ef67c498f48270c1833986be3668e47da426b8d4c37ef59ea2d09b3582f457017780059db2430d42202e48e55bdfa697ecbc64f19183 DIST genpatches-5.10-166.extras.tar.xz 3868 BLAKE2B 9de0bf3ec8b5d3cedf60f39ee1daba0ad24c23a3f43b9a35faa9b3bbc874b9fca5a6273f79ab840ced2f3880f779e0c4acc2f02c581d75618747f7c51dff6cd9 SHA512 6dfa61ebb4b6c08dfe42d3fa58def0adce6864ca2a8609bcf57720035b345f238aed22725a7e371e3ae562424049fd22da6c4c2dc5535da4b6820f645d832059 +DIST genpatches-5.10-167.base.tar.xz 4477064 BLAKE2B 35b2dccc482e167393c2aca9fb23dc2ae9fbbef9c4061cfb3cab2e3081a3d129a6c9ac5db2d4119dff624481e43174032e451ba1879831cf1fbd198baf092f50 SHA512 174df1ca9edef297bc727540edf820b18f9fcfce702bab3da7aefb8f1378e810267a368fa6a7742300588a3e36a709e09144383501507bd012753b45a342d994 +DIST genpatches-5.10-167.extras.tar.xz 3868 BLAKE2B 31508844298f272c02ce06f341597d4e75013488ea35409ee51f2af6dcebb14b2e3c17b7e27ccb766b051f618107aab113a6174959313d504a40456ca6910dc2 SHA512 808de5319a1dae4c6297a9aa6b249d02476870d9b929a2e7528d709cfc49d14e5bed78bc13167ce8d203f3e7ebb580d86382550de97690c7ae5ffb7d0fa0f777 DIST genpatches-5.15-81.base.tar.xz 3257712 BLAKE2B 66e0d129053b2cf3ba59681318be5c6a62d469d6014535bd4b47d5368a7718db7015ec1dfab34e4db324b4d626f8f8a9219231b2908c3fc2c2d51a3f99db999a SHA512 f43d637c799216e2bb99cfbab9c51b935d02f2dadaa0f2fad238f14393340420523c25927c10fd6b69745972cdf4e7f3e23cd56eea799626c69f4fb7d44b8e49 DIST genpatches-5.15-81.extras.tar.xz 3932 BLAKE2B 0783c48eab8d9f53d07770a3df525df2ffdab8f36d3d7db2d22e2fc5b0d1fe904644b013a3d1a5ea3d967636d4ff91b3f208ea8f004adf310134b98ec5cdd0fd SHA512 be4b557066d8d2327724c8be440ebcedb01d0eadab7bfa0f9f230111cba76a2623bec0945fc887b91d6e5c73eec3eec4fa29b2e76606e7871e81a91fdc4b2bf9 DIST genpatches-5.15-83.base.tar.xz 3328188 BLAKE2B 5d8da81e1c5f936ce49589d1dd10f41246a6059c410c0215b495ca7401eb618aa6c87d2ae23b08f27e3be5dd6b7f88e5d4e90ec9950924db9a08375d45cb2da3 SHA512 fdcbf6bc1e17f04df9d8334c1c75f21e5ca60fb99157708a4c599e43ed20a58664fe54fe8467924623d612ba2ddd409af4840195369fe274a4f55a84fce12ade diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.158.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.158.ebuild new file mode 100644 index 000000000000..c2fcac174860 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.158.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[@]}" +}