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 6F087158041 for ; Sat, 16 Mar 2024 08:30:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 224ADE2A06; Sat, 16 Mar 2024 08:30:14 +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 E8AADE2A04 for ; Sat, 16 Mar 2024 08:30:13 +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 6743233BDFF for ; Sat, 16 Mar 2024 08:30:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B623151E for ; Sat, 16 Mar 2024 08:30:09 +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: <1710577735.17e4db236659c255f23689b558d75dcd5d22ebed.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.82.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 17e4db236659c255f23689b558d75dcd5d22ebed X-VCS-Branch: master Date: Sat, 16 Mar 2024 08:30:09 +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: a44fefef-c220-4162-8ecc-9a5d25178d8d X-Archives-Hash: 08d37a22b0a8f81da4fdd7c395e261de commit: 17e4db236659c255f23689b558d75dcd5d22ebed Author: Michał Górny gentoo org> AuthorDate: Sat Mar 16 05:04:49 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 16 08:28:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e4db23 sys-kernel/gentoo-kernel: Bump to 6.1.82 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.82.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 27a36fd05424..e1755f62c7ab 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -28,6 +28,8 @@ DIST genpatches-6.1-89.base.tar.xz 4715392 BLAKE2B 36ac5c1d92985dba061e3ea8d1e9a DIST genpatches-6.1-89.extras.tar.xz 3812 BLAKE2B e5ea7db0e68120d8dcc8cb04b670a4cbe4b9f6ef169eb7815f2956c9b5c9f3570d418b3913801cdfa2779483bb6c5c97baf0500dba96025aa1f84e10b7208b1e SHA512 1d1b8860af0cdf6b31dfc596ea2d4662060f1c12f6661b9e3d5d127b0a001dcd2d4920d8b997f1bdbd47244d98a888986a6f3184054eaccf6bbb5bc3fcfacb3e DIST genpatches-6.1-90.base.tar.xz 4798868 BLAKE2B 3898a35ee9d3ea977c455a8432d512ed9f282f3b961b0046b79843bac59b136d9834c6fc128c5fdd2ba28b1d25e98c47b67bc3c50287cb05a372ed34d2b8982b SHA512 6bd2353dcb0caedfbd009f66d10e6201079c481101490fbe131168f0e46203446226c47a85059bcdeb8a3395ba79ed9ce0075c144ea8f94dffc0911958f679b4 DIST genpatches-6.1-90.extras.tar.xz 3812 BLAKE2B 466c0b796df7406c228fd4dbad20f84c2fb99203ccae1a9e018a15a0314dafb478ef89dbeefaa012b0873a06fe3398b7f17f68bf8275283cafd0d258d44c3572 SHA512 1744cb7d90176d3eb09195679b51eb0aadfe5a3452dc2d2b299262eb7aeda3071bd0bbdadab2c05bd266c288eee5580e4da1190f308e8755140d454226f32204 +DIST genpatches-6.1-91.base.tar.xz 4814756 BLAKE2B ec513671056ba3f42380e4f57115746c78ea26fe982bfdf9b0d7775938f90fed2d5c940ccc8bb90865874684104784631865b735ed6ca5cf069852611dd9db8e SHA512 8a034d617f7639d0bcf4fef64b1fcdd91f158311c4af6ef5452c666e3202078925f293daa441493180b4932d371094927b56d1c7adc7bd45d21b47be6f4a3912 +DIST genpatches-6.1-91.extras.tar.xz 3816 BLAKE2B c187eb9a26917038be398f55c68d2cf4bd985c778b892d9f22fb5bf6a9064cca0b4dca2e21eb3b1811f8a09b6e20f45f852c8d85a0559a52457e84c28ab58406 SHA512 3e8d69a5464f1e3d4a9629f4d5169c4d8f272a42a51e3f9f801536c6373745b55ef54e46ae54c302eb0cf498edb307e93671f81445e99591cbd63caf8cae3476 DIST genpatches-6.6-22.base.tar.xz 1119612 BLAKE2B e0e5cf468f1bfb7b76043b72528061a448a88ede3704fe5aab6fe9c5c5b4ff39362b8be25c5d10f1b0160c5071b4276e2c912606c857fd4ace2c8c92b54ea0ba SHA512 b71715d8bad12484035ab5d906db06fe570f40f0ff725beda500710837e9e90253b1fdbd2be40c0dc6d0226a8a1423e443b4bd7117142f346782401509f833be DIST genpatches-6.6-22.extras.tar.xz 3704 BLAKE2B c09db6ac1f713f404001c38c650731a0c8821c844eb7638b072cc0d135575df4f965cbd7c99c0261cc1021f97459266b20f153e428ba7a3b7973bb6453d0ceca SHA512 dfe66f78ca064ac0d6878da769dbdbc568db35bed24c8e2388bcc9a1ee63adef1e729ad9a3e737b5838c6f5473a7b9c6a6b44f97e95a900efbbf9562bf7462b6 DIST genpatches-6.6-23.base.tar.xz 1164692 BLAKE2B d42ccd9e636a413ffdbdb7dac699169f38b80617234b83b6ce49418f7dfd568f6d6718ce97a42b4df2f3ee1efa81df1a02102c123b88603dc558f72dd18af7e7 SHA512 1671b5d07294f73fe547a0cce8df38b5da78dc1596aa136190bae38d9eddc8b896c34e778eb80971336caa851c7d6c7640a59186cf1ecff26b89b69bdc9fb0da diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.82.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.82.ebuild new file mode 100644 index 000000000000..1e3dc608d732 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.82.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=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://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[@]}" +}