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 ACE2815802F for ; Fri, 10 Mar 2023 20:12:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73010E0798; Fri, 10 Mar 2023 20:12:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4F521E0798 for ; Fri, 10 Mar 2023 20:12:09 +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 6D2A3340C33 for ; Fri, 10 Mar 2023 20:12:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B538D4 for ; Fri, 10 Mar 2023 20:12:06 +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: <1678479118.2466a5b4897b1295c1740d51c17361798a11ff93.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.172.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2466a5b4897b1295c1740d51c17361798a11ff93 X-VCS-Branch: master Date: Fri, 10 Mar 2023 20:12:06 +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: eb505348-bc21-4f1a-a3ab-ec072eb38113 X-Archives-Hash: 05c318f597d50e15a283938b3140f0de commit: 2466a5b4897b1295c1740d51c17361798a11ff93 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 10 14:50:57 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 10 20:11:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2466a5b4 sys-kernel/gentoo-kernel: Bump to 5.10.172 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.172.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 6d7bcc1ca99f..013e6f8f5e92 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.10-178.base.tar.xz 4951584 BLAKE2B 179abbcf89b3ddf39dd4df86568 DIST genpatches-5.10-178.extras.tar.xz 3868 BLAKE2B cb6e6ac11355b5a8ae19a464494a7e418edf5d475b793114a0f23f3e4b173dd906f13df77474a9223a0cd3359c2647a736939fd2f98744a1edc42c870ee14b59 SHA512 24665f3effa01f08f4cff8e84ada35a019b09d4173e29f1413674635b14b25d78cf2177fe3f99ad6bfb657c56970b010a3cb21e3defc3b03aecb9efe3218eb96 DIST genpatches-5.10-179.base.tar.xz 4960220 BLAKE2B ea5daad3714354614f82977b59e4d2ebb6c31371175883195c7e6cb317a73ecd29ee4d7bcb326ad06e2cec855c74833baf13d3c7108a77205a4cd71b647ecac2 SHA512 ebc6d36654dab8862bd1b569564fbd64ec43397148748d9b7d953abfe3da33b75af0d536d09e44cd10cf19719e82fc5d8a403640dceb3fef75995b6c3ea3bf6b DIST genpatches-5.10-179.extras.tar.xz 3872 BLAKE2B e493d4df16cfacef4115e3d673820a8674d66bf4e965e6cf807e39580c4efb4dfed0ce16d415028a3e2edb46e03f3ba4e9063b5e44e6b89e6a9ac0536f5a56d0 SHA512 9bf3a036990f34d236809c5d88b8981a9a374d390b8b10ae640b7ab825a7929b6169d1e75cd7186e22b7a3aa4c417ce7ab222ff6e5f9429f33a1eb31c127ae0e +DIST genpatches-5.10-181.base.tar.xz 4964488 BLAKE2B 2b05c676da465b1627c92400f1290c7755c5c443db0f566fde2a2d35422f84a93875fd0cdd7af5ef331872a9ecb89e802ec48c76914a25d2b6d401edb2022d7c SHA512 2524417fe412b83e380ca55b89403abde41af034e5900daee53b82d7e4183a0345ce3e86e03ac9e211380437f4857163a4e81737d1117d7e02847ad36553c0fc +DIST genpatches-5.10-181.extras.tar.xz 3872 BLAKE2B dd1d27a04cd2215fdf9ae7301d6c90dd0a1e9e4ffe7e295dfe2d6b637de69303d9cd2a00a5adeb33d2c4cc7d984e57e69bd9f998df1da188ae006511fe70302e SHA512 b91ec330f3f87bf7ec5cdc10e6352070161d38d09fea82142b2dc475a0a25d176a262cc0bf24d4a4902e84abea84f6263c3e859f1ebf8f44155e42c5f565dcce DIST genpatches-5.15-100.base.tar.xz 4036256 BLAKE2B da0f271d54f248597d038a09f3cae6a2293ffbcaf9f06ad500060e0b28c57c0120c64f30cbb97b4b4585cc1a8f12b013258962a6599a166f5716e268b0587030 SHA512 865ece0271c674aff6df31d7b0ef8dd8d9643e9e7ab49730bb2892f82e1468f4f086710c62f6f647cb2a4e822a5a5fa2e2415fec8d900f82976bdca23384bebe DIST genpatches-5.15-100.extras.tar.xz 3932 BLAKE2B 55665c7edd0316db7e6a8391ccfc97a3f2c51e9e445bb81e0663ad69405ce577133f2def0e58711b1f8dab0b7bfb4314e05a41183138585eb24c909b7cc8c2fb SHA512 dd32b33616a64fe0f4b319e3424360a29d81ed1c6d94457da0458d7141013efab4933c685468019dc7c023346697d31c902e67d17120208ae408939b2fe1c5a6 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild new file mode 100644 index 000000000000..5bbe99781a9f --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2023 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=g7 + +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 + 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[@]}" +}