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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7ABCD158042 for ; Fri, 1 Nov 2024 15:23:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0BFEE089D; Fri, 1 Nov 2024 15:23:45 +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 83406E089D for ; Fri, 1 Nov 2024 15:23:45 +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 94D913430DB for ; Fri, 1 Nov 2024 15:23:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6AF01F64 for ; Fri, 1 Nov 2024 15:23:41 +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: <1730474604.db32d11b2774c58d590a498ae8e18a05789bc496.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.11.6.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: db32d11b2774c58d590a498ae8e18a05789bc496 X-VCS-Branch: master Date: Fri, 1 Nov 2024 15:23:41 +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: 8a95a050-a1dc-47fb-88cd-71757bbcc997 X-Archives-Hash: 356bb41ef34b3ea5778831027b05df9c commit: db32d11b2774c58d590a498ae8e18a05789bc496 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 11:58:01 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Nov 1 15:23:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db32d11b sys-kernel/gentoo-kernel: Bump to 6.11.6 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 3 + .../gentoo-kernel/gentoo-kernel-6.11.6.ebuild | 144 +++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index f1941ae0a8ab..5a586cd9c4b3 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -23,6 +23,9 @@ DIST genpatches-6.11-6.extras.tar.xz 4056 BLAKE2B 7884aa8796e7b79db2b0db6aff5cf0 DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B 80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae SHA512 02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3 DIST genpatches-6.11-7.experimental.tar.xz 5996 BLAKE2B a7c9ebe2b82c3740bab6353ee4209f576b8fbfda2feb2ba936d7280ad7148c3f1b0089c103c96c9defe17c128839e0d49ed0546edcd9818fe62cd2156ffdfc1c SHA512 770c1a114ac5ff26ef19248afc8e826549f0ffef87e8ff39f3f2af1300bf8e86d60b076e10147afe6e2b9c23da021f4e8f6a05d108b08350608af0c63a2b6b8b DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B 073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd SHA512 0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8 +DIST genpatches-6.11-8.base.tar.xz 639004 BLAKE2B 218ff37e8fb82b4bff3baa5b197b4c42ec19a4c5480620982f7befe8313f0f226324a629d6c15eee230faa3fc7c5bb558a58ac94e2e9b0259823c813220681b1 SHA512 cccc58e7ed24b90db88b14f9a693ccd021b1fa1beb9568511e344807673d2e518a66b2ffb48773a5d68da03ad15671181b7dc53bf2161ad1a88e95b555389116 +DIST genpatches-6.11-8.experimental.tar.xz 5996 BLAKE2B d14f97330a14afc3135ab48da877c028d9631254918256dffa32a189bc430e8f1bc892130ce54957da60ac59b4003c2c9d089b42604fee0b69635cde5f30b563 SHA512 0f195ecd51cd793c72025aee20f770bd2694e1cb0dc0ac2bd7d99db9e81fe6ac6367ca3279e4e1dc6fb6ec6abaf802563a032e15f21f9fe1a2d8f0dd0498e501 +DIST genpatches-6.11-8.extras.tar.xz 4056 BLAKE2B 33f594ef302fe78ec07e146dc0603ecb3eb0b61c6f3639dfd4f89885cd5533c53b1d0ef30618bf8c1fb749499721f668e28161890835725b4e62240f2bfd2646 SHA512 6424792e0f38d94d19d4849552597c5f44df4a47d09c237b49f084c4d780501c2119beb9d45e9027526423175e7e7fe9939c59eb242da5462bd4b6331edb15fb DIST genpatches-6.6-63.base.tar.xz 3551092 BLAKE2B 8edca00c49096ef4682038389b19e312773d3a56e29a03527e8f39ae835243193e2afce6411e0f1404af899793e766e108134d990dc666f15eebf02d6dfe6475 SHA512 0b51ff04cf01262502c3b1651288a87f235f3c1f4cf8b92699161353ddd75cbaecc27b8f2838375d77a4cf99a746a2175eab6fb0d23fdea67a6d4e9b89279ca3 DIST genpatches-6.6-63.experimental.tar.xz 5764 BLAKE2B 7a88fa28939aa32b1eb52b345dbf9afdc75c3dd8f8547fd8ef8e328a406751d1db67ad2eb338fa28ca8dfcc50c4c47f34415a4df257d5901d1466e9d5a01f8f2 SHA512 0a96f3fdc6bc186ba0893b04d8b16f5b60c337c276f2f6c0c5c93b13eb1138468ac20b96ebf51105209dc0be579b78a7162026a9e03325825df66aacddbbd6fa DIST genpatches-6.6-63.extras.tar.xz 4056 BLAKE2B a7a361bfe180362510300753b3fea12bb0ec1014a3b7307211931193672db1216abf994ba8cb22cf365221202dd93f4b49fff6970c8eb88b7a77ef7bd02d1f12 SHA512 49574eac90eb749de544afaa7102163607bc24e2214ccc3c84cb6bf8f60773c45831da93bb5598aa4b933f65455228649afcba6d93107a81a666828b0919b18e diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.6.ebuild new file mode 100644 index 000000000000..96da6b1cb09b --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.11.6.ebuild @@ -0,0 +1,144 @@ +# 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##*.} + 2 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.11.5-gentoo +GENTOO_CONFIG_VER=g14 + +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 + experimental? ( + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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 experimental 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 | loong | 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}