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 9D90E158064 for ; Thu, 2 May 2024 19:53:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D659E2A2E; Thu, 2 May 2024 19:53:33 +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 3BA4BE2A2E for ; Thu, 2 May 2024 19:53:33 +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 466B0343060 for ; Thu, 2 May 2024 19:53:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92CB819DD for ; Thu, 2 May 2024 19:53:29 +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: <1714679594.1dfb3e2123296ed285743aa636dbed56934c1943.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-6.1.90.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1dfb3e2123296ed285743aa636dbed56934c1943 X-VCS-Branch: master Date: Thu, 2 May 2024 19:53:29 +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: 7dca4830-355e-462a-aad5-13433945cc0f X-Archives-Hash: d28ab21d18c51f8e8383dcac8f8cbc60 commit: 1dfb3e2123296ed285743aa636dbed56934c1943 Author: Michał Górny gentoo org> AuthorDate: Thu May 2 16:19:51 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu May 2 19:53:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfb3e21 sys-kernel/gentoo-kernel: Bump to 6.1.90 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.90.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index b62860e398bd..51e120585781 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -14,6 +14,8 @@ DIST genpatches-6.1-97.base.tar.xz 5144036 BLAKE2B fd20d0a6c4b3f2bb68a97bc71e485 DIST genpatches-6.1-97.extras.tar.xz 3812 BLAKE2B d76227c06153026771849653a004ba3474a895e8757c46bc943eee5e30eddb86c7ee50272b339def3c07224ff65ad09e0e6cdd84f5622d2f7e74ef56e7c3ddbb SHA512 b2df67590530801817fbb0d9bc1a317df5642af16147bb325ff562e3cd2796296592a12ecfc1775f6cf9302ae7740c3cf3ec9c8637c4bbf8f7a0893eaaaf1695 DIST genpatches-6.1-98.base.tar.xz 5144484 BLAKE2B a337723a77e23789037ff71138906e1fe97dc14f928f2166de39a0d337998b11cd2decc91664f0d20e61632ed5b8870a9bbbcd5464ea83ac51769a16daa7757d SHA512 f1877eca1741c7b7d8e844fd8e9f47a228ea00803d5b352fc59d4af1d5e45a7bb817ee2953272e4ca49684df100875eb2d6f2fd3ed2165814c280ee588e9252b DIST genpatches-6.1-98.extras.tar.xz 3848 BLAKE2B c5092984f64c4b87256366831bc028613cb98b907b8fc162b0048f2f5185daa54021697f3ea783a56a531e036c504788b5d2e397994f18dc9c553a07b44877a2 SHA512 68a7e9ea763d2e1de5ecd8fa587338a1e72e94bddd88a295023d799a2150f584208d08eb2c451d0d0a951b08d42f5b1d6e3ef08433b4953d1ae77d729a9ae8e7 +DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a SHA512 39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf +DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d DIST genpatches-6.6-35.base.tar.xz 1860992 BLAKE2B afeb95582f83a941d830e8a90d1b7e6275d6d43b41de93aeb01dc743b1afafc5d675d98b66b528899fe9e69fe856402059932be58487c74bfc0102cff748244a SHA512 bf2848bc7e668b8b8df410f22f66b575ccd3a4d160efc6ac5d3549e4d34dc10d81736d8dbf689e64414491d4bb5479c54ee8ba7d6ad9d3dcae7db1d15c13dff0 DIST genpatches-6.6-35.extras.tar.xz 3704 BLAKE2B 23fe1a854b29b205e93ac82a796ed6eabbc96774648168f616c2366f647dedd5f5ebade68059bc7e9f8aad5b57c8b7577b6e098859484f35c07913cb4e3567a2 SHA512 37e311b153e411df00489bf4973e1a414b480c4f2d6ac488ddd8af3f717461b14c53143696628df3750168869cfcc3cfc209599454f9873e28ae1e1390198076 DIST genpatches-6.6-36.base.tar.xz 1937600 BLAKE2B 8e3483fb9e7b3f6f63e97eb4dc66e7f0ea8c48fc22c17981d930d89fdb878fe0325fa7898df1baa8e8252a2ca122ab77e027e0e1da0881c9240a70d5dd912951 SHA512 8b66b6584b7d14ef3a897e4d71395340d6b350ed53a656988f40487da3819d403fdacc209df593459042d6c5f3ec4605f3e0d7cd78654cbcee9928ea022a6be6 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.90.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.90.ebuild new file mode 100644 index 000000000000..05e46adc1bda --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.90.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2024 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 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g13 + +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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( 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 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +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 + ;; + riscv) + return + ;; + sparc) + return + ;; + 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[@]}" +}