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 0202915808B for ; Tue, 1 Oct 2024 03:07:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16EE4E29D5; Tue, 1 Oct 2024 03:07:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 F2FACE29D5 for ; Tue, 1 Oct 2024 03:07:02 +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 3DE24343057 for ; Tue, 1 Oct 2024 03:07:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81D3A27FB for ; Tue, 1 Oct 2024 03:06:59 +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: <1727752012.300a3effdd20bfb49df76bc1e9f9b9659801b52c.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.112.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 300a3effdd20bfb49df76bc1e9f9b9659801b52c X-VCS-Branch: master Date: Tue, 1 Oct 2024 03:06:59 +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: 39266958-7099-4e79-bc3c-b68dd11328d7 X-Archives-Hash: d5145365598cec94c6e9ecf5db63a008 commit: 300a3effdd20bfb49df76bc1e9f9b9659801b52c Author: Michał Górny gentoo org> AuthorDate: Mon Sep 30 17:55:28 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Oct 1 03:06:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300a3eff sys-kernel/gentoo-kernel: Bump to 6.1.112 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.112.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 41a13cb83052..1f3f4e837861 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-6.1-120.base.tar.xz 6050748 BLAKE2B 8e81d186a9e5618d9f561fd0d499 DIST genpatches-6.1-120.extras.tar.xz 4056 BLAKE2B 2295b59dea7ee450c0d6b109da2fc341e96030616635800a02847f93c4cd0191229c6d74bd68994ac42d2a96691856315127a060cd3873af34357f12ab54193c SHA512 8e1b92d4ab4cb327868f4e06c7bef5a099339c3cf2331ceff3aa3731632d1f8f7b427da5f892540a64f8afd86d89048100b93c8a08d40a99f5760a35553dca25 DIST genpatches-6.1-121.base.tar.xz 6065048 BLAKE2B ef60651e53c53c2e918da2c9dd4759cde88472e2f6aecf4ed6a86f089a282bbdf7acab040c7660e52ea09e441f6008f17ae3d49afcd339e8b91d50cba48bda18 SHA512 e34af3822f10164dc0729d0803c6f3ea05e57c6ac157567bdec6d8d0a3e78fc72252606f3b3160089e7b4b8167ee76b13088cf1d238cc3db2841e2dde63b82aa DIST genpatches-6.1-121.extras.tar.xz 4056 BLAKE2B 23ddf1bf6ee9d2790e952777edaa577916af9897a957c4e2f4714421ad7aae213b82e1c7d7b911a65f3ee6b27cefee4b5839d14ef1b0e539fe86d91722d0295c SHA512 95d167e2d5f8e883136923b332e662e8475043e0b2324b06a3e718a2bfb7e8f7b87c1cf0961ee06b0cff7fcae1e1dbf7446812fab7237416c281033f6777cc49 +DIST genpatches-6.1-122.base.tar.xz 6092444 BLAKE2B f612042eb0f7953e5842cdcd3bd1febe169aadc6fe36dd27a58cee9b817f51340941c5b47724327deb3a8c409ed1da3f932589d76d919a05ef9f74a69d8bd6a3 SHA512 95d9cbe363363f515af9a42e4d099a2de2e3e5276ed9a1dad9de0d9a4da8d8ecbcaf0b82a8e36058794a78887658e6239e1408ce24fecf4bf099a6a5e6b19d30 +DIST genpatches-6.1-122.extras.tar.xz 4060 BLAKE2B 7578edf3c61e6da2c9d6049d3bab807eedffcb2bb8add0d0c1835c2f5d292ac4ef2b83e3595342745a2464bf4f4c60e39f82b342e84fcbbb33721ed5e1382b6e SHA512 44c7d3dd62d2efdf8f4a9632d025121b429d48cc4bd7f8eed754d7a0223be9a201673a10310dabee04ca29188193410d82317da02527f4016bfbb4fb6622bb8e DIST genpatches-6.10-14.base.tar.xz 759584 BLAKE2B d08dc14d5126e73155a6b1977ce2b9790a5717b6bf1fa31309838c3884a81baf945661093da2e3f69bf892f472db60defe1a001afa4b9a6846deee11cdf6cec2 SHA512 6e41093c8ee9690ec279a3f35c01d058ef02c3a9eac7b9eaa3908c14463c8d3c85497665b875111fd1a29e8d406706aa6f6791a44e0bc31d8c51053259a18d87 DIST genpatches-6.10-14.experimental.tar.xz 81216 BLAKE2B 28d9b50c638df0bf214bae28072a580455059e1205b7f69575a8f24a9375f9473ad7a96ddbfc0d42f907c4c683cb9f929fecff1bb95d3512a1e725f808b19571 SHA512 9eb2336dd5a5e4cd39723b88f7109ac690094878a89b0fa6f329def7011e35de54615a58a2a18244f3fdea408dff5dfc3e72c8957d13ba44fd1c63522f7a9340 DIST genpatches-6.10-14.extras.tar.xz 4056 BLAKE2B 63d33a29efc77a7839f4961de62c54f2383bcc7a119fce5ca7f80cdb66515537bb1e1bd55bb50f297b8f0a9c74f75bb237ee2893a859abe6d7f05864ae21e38b SHA512 c9adea40fdfd3faa5ee24a60be9ad4444819a8fbcb417ea98ce2f7a02fdd1e70c6f1168380cf6efd5a4d1820bea14db48c3064b271afaad8e1d23f0a8263a48f diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.112.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.112.ebuild new file mode 100644 index 000000000000..21c9b05e1334 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.112.ebuild @@ -0,0 +1,137 @@ +# 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 + arm | hppa | riscv | sparc) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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[@]}" +}