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 4A0321581FB for ; Thu, 29 Aug 2024 19:37:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42CF0E2A0D; Thu, 29 Aug 2024 19:37:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2B79FE2A0B for ; Thu, 29 Aug 2024 19:37:10 +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 713F6342F8E for ; Thu, 29 Aug 2024 19:37:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98A731F2B for ; Thu, 29 Aug 2024 19:37:06 +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: <1724960219.26927d6274f9629cc0ce1feb3ec2d13dd08965d3.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.107.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 26927d6274f9629cc0ce1feb3ec2d13dd08965d3 X-VCS-Branch: master Date: Thu, 29 Aug 2024 19:37:06 +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: b1092ccd-4c23-42f2-90b0-7ac4181d0809 X-Archives-Hash: 60ec0c4a08cdc4852b5112639dbb59c8 commit: 26927d6274f9629cc0ce1feb3ec2d13dd08965d3 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 29 16:58:25 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 29 19:36:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26927d62 sys-kernel/gentoo-kernel: Bump to 6.1.107 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.107.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 3c663fcc689a..41bd23d3912a 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e12 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041 DIST genpatches-6.1-116.base.tar.xz 5862440 BLAKE2B 57df84154c9302bfc602035d8b06ec4b8e2089e8529d8a425c6912c46ca5d7f5782e60efc1600b085a1e60f4f029376485aeeafb6890bab20901df152c18bf25 SHA512 7467a3963981f8862a0898f4baabf95d25c4bc13eb5cc41b28307d48150bb263cd34be392f6e0130e053105f385ae963b03d306268c9eec3cc0e807cd3e56a7a DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B f1c06b3d9f005cf93a317e051104af5a5838dda32e7d480d67655d26afa636741053da4e3c39aae81593cc12708d829d4a8f9e167346d6b038c4b72bf70c9626 SHA512 3ff2f66f10a0158c9890ba629cd0d0bea46fbf5ff899dd4a0dbdb70c5aefb2ab0ce89c316a76441d0dc500e740f79b15568209a4f97b82a1efb0ef088ea00d36 +DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e53f894e5749805bff33676263b19b67eb1315012da7ad5df5cf129406c0a0f1726dc31cdc33941eb2c27db699f04333b2729d SHA512 80fdb4aa7531a7b10bc543d8deaf2b82115f9b74112c53f787f9fcdfbf83c626390c4e81a6811874263753c74b0adc19cde44f6a54c22f6ada7e774e7a2247b1 +DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7 DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4 DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11 SHA512 9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild new file mode 100644 index 000000000000..dcba4a9c42af --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.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##*.} + 10 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.102-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[@]}" +}