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 9086B158095 for ; Fri, 8 Jul 2022 10:14:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44B82E0E92; Fri, 8 Jul 2022 10:14:41 +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 0FAE4E0E92 for ; Fri, 8 Jul 2022 10:14:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1F1D9340E52 for ; Fri, 8 Jul 2022 10:14:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BEE552C for ; Fri, 8 Jul 2022 10:14:38 +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: <1657275266.319bc4079f58f279cb1a029cf93b7543969ca11f.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.129.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 319bc4079f58f279cb1a029cf93b7543969ca11f X-VCS-Branch: master Date: Fri, 8 Jul 2022 10:14:38 +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: b3bb04fd-b47e-4012-ab4c-6d1f15852431 X-Archives-Hash: 43c61d4dc8ca376873971e957b421695 commit: 319bc4079f58f279cb1a029cf93b7543969ca11f Author: Michał Górny gentoo org> AuthorDate: Fri Jul 8 05:34:05 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 8 10:14:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319bc407 sys-kernel/gentoo-kernel: Bump to 5.10.129 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.129.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index ebe6173a6fdb..a2400d2a9151 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -8,6 +8,8 @@ DIST genpatches-5.10-136.base.tar.xz 3735152 BLAKE2B b8719d909793dad9e9970af8a8e DIST genpatches-5.10-136.extras.tar.xz 3868 BLAKE2B 4d914dea81f6223ac97dc8a9a36f4f635e3a7223c25d311d5a313e25d21d779fcacc6688b2c303ad3ddb5e68b6a5572050e060a4129a90b7c6dde8f5325147be SHA512 c02024ea0782ca11db45d117f112702bdd839cc318e4a3d852be6d3e8e62b88fe200705ec817d0cc99b3a9d2bea1206964ae4ff5a2a9e06867ff987c5fd0d389 DIST genpatches-5.10-137.base.tar.xz 3737796 BLAKE2B e0af05dc22c6f077a110518f9e0cd790798b8a68f5d40c409dac7ea1845b8d80741975cc11d588a8cad96aea474c98803cc0db7631575d295ecfc0a1b4080864 SHA512 f9dd222670326f89a9ba62360290a29d5185afd89efe8aa38292a025dae941b10c28ab047c1fc7e84506d43ee56fda0790280c52ffca482e3041596696437ff8 DIST genpatches-5.10-137.extras.tar.xz 3868 BLAKE2B 97e6520ab0908d1270d10b6dab659899335aa405083e187822e7846a5034677fc77a05a20c33665ff9cd7b8a57fe95126b3c60218b0b5968967a866b241f03e1 SHA512 3945379ae2e5c2d5712788fdd27db2f74952686c319266897f649003198d0a5717c48c214f8e07310d6c489de8725e3cf4a74b4d05bcb4ae01332af175fbfbb9 +DIST genpatches-5.10-138.base.tar.xz 3762688 BLAKE2B 44039c709108f0b9a9ff95ffbcc35177536dcd1364424e3c555ea4611ca46d00cb13402d611bb9f7c839a2e2276d34818777edb206aef1cbf1a86a8a63fe5c45 SHA512 c9276637988fda74e346cda54dd86245e31a1be53dd10b42e3ffcb8b253d13b9209131925410a5c8797018bb940aa11db9120c921e87a45ae4f4396dd2e1f276 +DIST genpatches-5.10-138.extras.tar.xz 3868 BLAKE2B d08d8e425e323df25f3bad59bf71a0836b00b11855028d131d34a25938d9783ca85cb8ef5c9cae65eeec2a41280eb2cbf8816b94ee4c48c7a01d55dd4224f9ba SHA512 6ff612c0e8a050124a7f2bdfa2ff64f99bb0250e32f79b57855d9a95d7ea3182913ee016e63ae86413872791342c8eaea198929ae413dd0eb92eaefab4b953cc DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8 DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2 SHA512 bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.129.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.129.ebuild new file mode 100644 index 000000000000..161f70398d65 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.129.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/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[@]}" +}