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 D4A71158089 for ; Sat, 2 Sep 2023 17:35:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17BD12BC02B; Sat, 2 Sep 2023 17:34:59 +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 EE7792BC02B for ; Sat, 2 Sep 2023 17:34:58 +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 934E2335CEA for ; Sat, 2 Sep 2023 17:34:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DCDD1110 for ; Sat, 2 Sep 2023 17:34:55 +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: <1693676083.a742c2184c66034cf89b5f9df4130e8becd468c5.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.194.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a742c2184c66034cf89b5f9df4130e8becd468c5 X-VCS-Branch: master Date: Sat, 2 Sep 2023 17:34:55 +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: 7ee46539-b1ed-48b2-891a-21348ba60187 X-Archives-Hash: de08fcf6bef98c75cbc1eb5dab2cac4c commit: a742c2184c66034cf89b5f9df4130e8becd468c5 Author: Michał Górny gentoo org> AuthorDate: Sat Sep 2 14:17:15 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Sep 2 17:34:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a742c218 sys-kernel/gentoo-kernel: Bump to 5.10.194 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.194.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 567dae865c05..71fbf49a8511 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -2,6 +2,8 @@ DIST genpatches-5.10-201.base.tar.xz 5812032 BLAKE2B 17e4a8b463e258f0548e3ccea5c DIST genpatches-5.10-201.extras.tar.xz 3868 BLAKE2B e2420ee9cfb3e2a928ca1cc5a87bb832f436c3fedb0f4f001975a48a058c69cedcd58f97e5c76758ab737681ced55fc214a537fdab9400b839673bdba6c697c4 SHA512 c719a63005ea809d9bdc5d4b01f1400db0419a28bd629843f2d339a6f08684b4876fdc0eaa09133b7853ed80201517439e04580618ceabb40484e952efe796a3 DIST genpatches-5.10-203.base.tar.xz 5898100 BLAKE2B 9a167c9fd5d73f8aa20db8c1fee7a8b2293ede05e6beab6f4a312b3b5b0714da661908d9cfa0f981b6f544fa9572617c54e5fd595a6023686dd0616d20fb74c7 SHA512 7f04f20e1d7c90c55d24bf3c8b4eb40477df85440d433ae68ecb7acadb42496360df48baee378528f87b575a51bc4805d644a8f40044a6cc071c1f7975692fb0 DIST genpatches-5.10-203.extras.tar.xz 3872 BLAKE2B f5578b93215a3a4109468a46747ef70504668d5de7b7e9562e83cf6d5268633f676b534ab08dd97208c545baad48f680d2bd1e5acc80fc41b68f3aea7f9fe28b SHA512 e075f72e641e21abc91a6d648005d7479be70352b44034091d8cdf8a0c20f8caa75f268ef0591c01eb2ce8819fd2fe99fd176535c40b6fe2dfcf9708c48ca8b2 +DIST genpatches-5.10-204.base.tar.xz 5899804 BLAKE2B 5bf19ded87f3178252259d863bfb22f4d2e5ff68d97edd7b9fa0ac74d803951a7db57c0bfa33f5645ada4b7f5f19d33825eb2f2f1c283b6d5cb16279186f4f0b SHA512 267d325ed9bbcd0b21dbc5c537aefe73eca22152082e515855a7ea17acffb8ca57d7a9c599467c73534375ba487d85e8362dc61b9226541fe728fef61483d3bb +DIST genpatches-5.10-204.extras.tar.xz 3868 BLAKE2B 150f953d75e2e051124f44253272a5b62822a19cc9226d82d44439595a4b0f5eb0b1a97f92a07f5d766f0cd5458ded1833ed878e03023f1a74d45162d24cdf51 SHA512 812e6d24f19c3df5998a921261c60e2515811bcf4b4295c16a2fea02fc535d6e944b7a498b142ec65bdbf75d8dd585adbbffe8b80d373c4094ea0a7f1c6d5eaa DIST genpatches-5.15-133.base.tar.xz 5249652 BLAKE2B 309acc807e07bfcbb34e0ae87618d6dbb76e6481699fc017f449e61a2518e96e1abaf43ffe32bb9f76786fbe8bad5607407be4a40dd8d26be484943d5b4afee1 SHA512 f0c689a808a7724cb4f30d697c22a0a089df3e0f837440b22b6c32672355b79898c8097810fa1e420e0f8c364f5a33b6c373db58b7c8caac8b67be763a820cea DIST genpatches-5.15-133.extras.tar.xz 3932 BLAKE2B b99e279af41ad1d19a58e8f9b1bbf392c805a46c371d7a022a65c0090b5824c6ce26280525a0c21feda2a5a5cfffcafc690a2194d29af6a44e10a9d4c923db8b SHA512 7cd772a6feed01543305417ff03b834bb002821ccf254e7f5481623a7f16b0b54da5fc72c21f4ae3481308eaab08fcca8fc5103ffbed58dc4355cfb661f04f8e DIST genpatches-5.15-134.base.tar.xz 5282056 BLAKE2B f973657ec1cafc1e6cfa44b3fb2d8d07b33dedf7118811ff44afcd369991864667635aaaffd9d4abc9cfde5308bc32dcbf44097c1989511a9cd4ae4bd4392190 SHA512 e6d2fba989cc1d67a0d77526b9498f9d1214b2b3fa2210b17c58d7a4d47630a7d1ef1788d255082acd17e475997c12a007d8411ae5478f2cb2a34c7d4e2ffc60 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.194.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.194.ebuild new file mode 100644 index 000000000000..91e1b5a2d288 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.194.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##*.} + 10 )) +# 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[@]}" +}