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 492B1158013 for ; Fri, 1 Dec 2023 22:21:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A9962BC032; Fri, 1 Dec 2023 22:21:38 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F09B42BC032 for ; Fri, 1 Dec 2023 22:21:37 +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 E7F9B33C84E for ; Fri, 1 Dec 2023 22:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52A3A1305 for ; Fri, 1 Dec 2023 22:21:35 +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: <1701469291.fd45d73f2cbb1395078e93f930d03a8ac33ffff7.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.202-r1.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd45d73f2cbb1395078e93f930d03a8ac33ffff7 X-VCS-Branch: master Date: Fri, 1 Dec 2023 22:21:35 +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: 63bfeb36-ad1a-48fe-89ee-ad72fdf18602 X-Archives-Hash: 62ea088d27ca49552e2e49f45079fa88 commit: fd45d73f2cbb1395078e93f930d03a8ac33ffff7 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 1 20:31:23 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Dec 1 22:21:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd45d73f sys-kernel/gentoo-kernel: Bump genpatches to 5.10.202-r1 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.202-r1.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 62ad9abb8840..5dce88f85871 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.10-210.base.tar.xz 6166764 BLAKE2B d2afcbc4c25f01401b9971ee354 DIST genpatches-5.10-210.extras.tar.xz 3876 BLAKE2B 51ff2998ba7713fd4c7f4cd025b5abd014ef7c8e944841a1b6a6517141aa4b74efb2b017179197b03c82972e1b24bfc3deb9ee4687e551af8b55162e3f73c520 SHA512 24cf5ed8915d9db4ed79e05d07bf95ae499daafb79b15113a917743dd5421467265b47effb356d813165f5d7675213e5d2d4ff9be37b11573e77172ef72c05c5 DIST genpatches-5.10-212.base.tar.xz 6247964 BLAKE2B 946041f888556cfdce0b20394321eef7a28434b0a99abee389c51f72b6903276376d19e88f0ee8615269b73376667a223cfdc0c2c16f5a43d9fecd4f26d48edd SHA512 b3a67d0adada6c8922a9797a094192def65404ba75db193fd7b92a4389437a0163e259acd271e8a12bcb68867447318411bf85e4280e8bd84d5c105635f8b97d DIST genpatches-5.10-212.extras.tar.xz 3876 BLAKE2B 0899603bd8419915c49ff71ed423ec39ea5030b648ad9e3a2c25f02265b902e6797171bd58c2ad0be37a62caf0de65bc565dbeba37b0c2336c68edbf7374c932 SHA512 39ac14f636ec9a38968f525fb3aa6aba7c43082fb85cb6995210da93ac932a34e74645c5fefff9c7dbe7c2c27195bb4992caac858252e0ec2b0e2ac2684c3075 +DIST genpatches-5.10-213.base.tar.xz 6247856 BLAKE2B 8decc2789f586d6c91cee876713e76dfb15d2df1191deab54d8c656859561e29b7516693d46b9922c69cc20572c0c79cac02088b9e85d5c2fa0cf72ad78f1210 SHA512 9c2e5f12baeed7d57c6730f458ce32ff01ff3120d4f11e524e14062b449ea43a0e467950171cbe912de0c64e6b16ce1193d7e8e56e190d6abc1a8adc9a7b9f1d +DIST genpatches-5.10-213.extras.tar.xz 3876 BLAKE2B b852d4e7759f8f3f6adb9789df694f083f3a8b26cc0f44dcfc30b45f0b0b1099a1af6495df7a5ca8da8b3c4d1e83dd9f493cefe8787d80e45843a64dbf72d045 SHA512 3d6ddd8c9bc36cea25dd778924b2f2577f6b62d773ff1e3b847a604b9558e7614bdd805860b3efa0a2fd22fee3363a8f64cf8e9be24da65a8e132a447d09d9eb DIST genpatches-5.15-143.base.tar.xz 5634608 BLAKE2B a00b2898db47b874fdfe2e2bf0c40edcb4f358765f14aba79c686b8d6f99c6a77792d45dfcce141837ad6d956c6ce417453e53b6ede9db2f4e88b501aeabda21 SHA512 1342f8090f18bd15c44ca11409fc09ee5c406801fc077277682595fd58e8f37a57e022f433a0e8fb132cf6bee64f48dccacdbdbabab776d45634477e195eed67 DIST genpatches-5.15-143.extras.tar.xz 3936 BLAKE2B c942135c9120024effcc516070b81aef19de95969e19c95b7c222ccf9ba515db329735596f3c5dfe81f12ef29165b898de75988f0c632cd228b6d3579e3c5648 SHA512 eb9d0661d81c1acbf5884f3ccc864e0b110a517556bd62020f41f3fad77c32e57da5a7c1f6411a4dc7d9b85ad8fe9af4658613b0a3e9484fb609a7f9ac1a3f39 DIST genpatches-5.15-144.base.tar.xz 5663416 BLAKE2B a4347f6e6f5916a3811ddb7ce19a506f6f4bb691e57ed5229adb55d90aa2fce14656d1a77d63539ef5fba8c0a5ed8c3cd0933c9f286694a83c65898b77015e66 SHA512 8f4a7429a9673cc2aeffe870ac1f742b6d111b0fb72bff74b3407d13eaaa6200ae7b931449b7c5923c215428b2c55352f728d60a09f1ac7907625f37a454a3cf diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.202-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.202-r1.ebuild new file mode 100644 index 000000000000..89ab1fe6bec5 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.202-r1.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##*.} + 11 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g11 + +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[@]}" +}