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 4CC59158041 for ; Fri, 1 Mar 2024 20:42:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2297E2A0D; Fri, 1 Mar 2024 20:42:20 +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 9158BE2A0D for ; Fri, 1 Mar 2024 20:42:20 +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 EBA2F343116 for ; Fri, 1 Mar 2024 20:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D1D014F4 for ; Fri, 1 Mar 2024 20:42:16 +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: <1709325370.bd6a8d6a12a5b6e541f4ddb69474501c7dd86870.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.7.7.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bd6a8d6a12a5b6e541f4ddb69474501c7dd86870 X-VCS-Branch: master Date: Fri, 1 Mar 2024 20:42:16 +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: 938a22a9-9746-47cb-b1f6-3b19bfe7efd7 X-Archives-Hash: 4eb649e0975bb41b42f3a3f1f61381d0 commit: bd6a8d6a12a5b6e541f4ddb69474501c7dd86870 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 1 16:58:53 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 1 20:36:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6a8d6a sys-kernel/gentoo-kernel: Bump to 6.7.7 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.7.7.ebuild | 153 +++++++++++++++++++++ 2 files changed, 155 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 8c659f732d7a..3b86a0a49340 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -28,6 +28,8 @@ DIST genpatches-6.6-25.base.tar.xz 1351392 BLAKE2B e1f5df7796f7d50a244c37d2b5e4e DIST genpatches-6.6-25.extras.tar.xz 3704 BLAKE2B e7709d6dc9f02a24a5efff213e4357a25777364cce38387b5a12149915017cf229546993de40b4e2aaa6c107b1930f091e5399c14b660d07f3e73a1a6c4f287f SHA512 babba6d4e397a1594d74dac9e588fe87ebc07523ddb5a8e4b23028043534a965d29a728cf7958da90e6544a3e1d0fc29de65542610f5ad513ca7d7edb5a89c5b DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951 +DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f +DIST genpatches-6.7-11.extras.tar.xz 3704 BLAKE2B 1afd454ba83299605a573405732f41eda7a261f8cf524bfdaf329b4130849b0ff0895d39902360e3e4351fbf5ff1aeb2e378372d556bdf3c90b330a2195a7c89 SHA512 9d5b52bc1853f5cc41bc762ec023037ec25f22e13f1b098f7e7493b29645cdfbea14ebbac291330ae61a7c1a9b5f8291b7b2f88f61690cfe00a129693b98d035 DIST genpatches-6.7-9.base.tar.xz 503176 BLAKE2B 420c8e40d2abc26201b50197f3cf32f8a3cd2e3d49013e60b215fe567089e88bfeeac8bba1f8d95724c51dc1e72af86ea18c9b5f35133046f9f77059f0de3bb5 SHA512 23b636e3ab4bd81c509533cf76f96b7e5b10d4d9dfe57b5bb162d53991eab57043f3b935882e7643e1f1db39de4e18143785d0f65c65ed71e9b546a147dae4c6 DIST genpatches-6.7-9.extras.tar.xz 3700 BLAKE2B a535ebb75c26ea320af3ee4523d48c479e38acced934c09e6dd027df2c1ec281c8520d953b238b4a88c1ada82b5fadb77e7ddcade3ee112f50e1ae7b3eff5a79 SHA512 91dd0e05b3b14422d65752e6995858b68b75d155e498b89280cac776f29ef7805c74b9e46505a16d7644cf94b789cba7adf2bf18b453e93122c8c361ee22afcd DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.7.ebuild new file mode 100644 index 000000000000..8b79d025434f --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.7.ebuild @@ -0,0 +1,153 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.7.3-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} + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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 + ;; + loong) + 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}