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 47015158099 for ; Mon, 20 Nov 2023 16:03:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFB7B2BC042; Mon, 20 Nov 2023 16:03:39 +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 C2C1E2BC040 for ; Mon, 20 Nov 2023 16:03:39 +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 47E86335D35 for ; Mon, 20 Nov 2023 16:03:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 880C613B2 for ; Mon, 20 Nov 2023 16:03:35 +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: <1700496205.4d55cf19be08ad4c6cec0336b5822c892db8fbaa.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.6.2.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4d55cf19be08ad4c6cec0336b5822c892db8fbaa X-VCS-Branch: master Date: Mon, 20 Nov 2023 16:03:35 +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: 09247a70-51a7-4ab6-8bbc-eb4c64e2b232 X-Archives-Hash: ab45af7d59b63ed1b77e15649dd08270 commit: 4d55cf19be08ad4c6cec0336b5822c892db8fbaa Author: Michał Górny gentoo org> AuthorDate: Mon Nov 20 11:51:11 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 20 16:03:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d55cf19 sys-kernel/gentoo-kernel: Bump to 6.6.2 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.6.2.ebuild | 149 +++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index f7e9cf686fee..8c44650e2e5a 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -24,6 +24,8 @@ DIST genpatches-6.5-14.base.tar.xz 905872 BLAKE2B b8fff1e8a9a9c4d23e70597a7602c9 DIST genpatches-6.5-14.extras.tar.xz 3704 BLAKE2B 21b8a21e4c86bf6d49a6eead8db5baaf2d1c4aaffc8ce6afb23a66cb1b3cc124e864e982d0d2bcf8d3edfdbeb58db71bec3de701db40027b56720969eda3f314 SHA512 f2f3cb5dc4535167448c426d22d8d49205c1474b8faad880306a317bafb3e40052689bf25942f1537c5c9188a10095fea45f4e259ee06739e8913b70ba9f13e2 DIST genpatches-6.6-2.base.tar.xz 14616 BLAKE2B 3da38df6de90845f4ffdd61708573589973649c5d38082199994488d2679cfc70f954acdd1760a1b4a9162944f0bffc0443590956898b6d1fb79a363958c2859 SHA512 5abd3bf1d05e0e4331ebd2046d6f1e4f1091e25bc4d5624b78f6cc702dd14f6e11f6441bf12694500e96803909384420cf3b82148ae80c23a7f1c66b5bd2bb84 DIST genpatches-6.6-2.extras.tar.xz 3704 BLAKE2B d236133d98bb12a2310894614452c4d293b082a8f42a26c502e26022432515e71791dbdba1ca25e62e5d4904b441bc86ab123915ace1606d1e28571e83f0e9a5 SHA512 3bc907ecd0bab38c21ba8703fd0b44a0f23c9ac3de36029764813d121f0e4f3da8299671ebc021bf501c7e6cd63b848bb80a14fcb601f02cf850a8bf3bb0d826 +DIST genpatches-6.6-3.base.tar.xz 214140 BLAKE2B 8004fed867cbb854c681834b0d297336189a638cf4b2f513e3f78fba469e0f385ac02ad7cfd752ec351da1aea7698576a7ae7001fd2872cd8124d4e664cba0c3 SHA512 1d6f276b145b7ebb6dbf9064319ae64050ff613f495fefaa973c06abfebce23f176ca00988918812ce81610044ab840cbf77f3b015c43754cf2c1b905a516dcd +DIST genpatches-6.6-3.extras.tar.xz 3704 BLAKE2B b8d26172a7fe7a85bdb30d9812da3e76d9bc061597da43b66d514b6aa24fd1ca8047989196003488db13107002a727445fe6d5cc7160d795b9a6f0f2c43c0f8e SHA512 964a49545c37d981049f2471ca9a29609e491550018b248ed7cc2775e32974ccd015f116533d0468652c9ee3af0f16831cc5ba2ba4c68bffa4e250826b9b11fa DIST gentoo-kernel-config-g10.tar.gz 5035 BLAKE2B e965f157b6dadb9c6e355ebe5f9c56625ac69f34a70d6238cd56faf76f7a6583242ea61283c45f2d2cc807ce258c2d405130109ac6e28155849a73871691ea9a SHA512 ad7419f1f183a0380896b3784ff4ab260ff850f2c055156c53f20d2bf3ea4350affaf37aef505e680928ae0f8882f12faeda02bdbd9fc26aed4aaae388290e95 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.2.ebuild new file mode 100644 index 000000000000..71044a7e9136 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.6.1-gentoo +GENTOO_CONFIG_VER=g10 + +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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}