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 ED8AB15813A for ; Sun, 19 Jan 2025 20:42:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB428E076B; Sun, 19 Jan 2025 20:42:19 +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 8C6EDE076B for ; Sun, 19 Jan 2025 20:42:19 +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 8FA5E340BDE for ; Sun, 19 Jan 2025 20:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F27E122FF for ; Sun, 19 Jan 2025 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: <1737319332.35d0e3f741c57c95119bc1e349d6d037809b8bb2.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.126.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 35d0e3f741c57c95119bc1e349d6d037809b8bb2 X-VCS-Branch: master Date: Sun, 19 Jan 2025 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: 99e9480c-b305-4dbe-a669-0f38cca3f379 X-Archives-Hash: 720d27070d1016a1bf2925f32795185e commit: 35d0e3f741c57c95119bc1e349d6d037809b8bb2 Author: Michał Górny gentoo org> AuthorDate: Sun Jan 19 18:58:17 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jan 19 20:42:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d0e3f7 sys-kernel/gentoo-kernel: Bump to 6.1.126 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.126.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 0ef5e298433f..7887c4d371a4 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -16,6 +16,8 @@ DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8c48dab78783e4d144eaf2e798fd0f1fe1e192138dea1802fa7a17385c6ca65ddf9b089cc3e547ca23efa36bda45cf355f5e SHA512 33e35c97ba7017e0b8c78f53aa4ab91e57c0a1f1fc246fec6ba6c3a091577bda2f99ecb1d909f3599d9123f2d99e756b7b6bb5b8086c8ff4cefc28a1827e5410 DIST genpatches-6.1-135.base.tar.xz 6772832 BLAKE2B 7aad4f211cbebf17baf43c2009e2343f3bb737d8665def616fe5aeed2816e9dffab4762d8a4cb3929c325315db5787d7404dbffe05ac23c3fc0c3327d5449d55 SHA512 ad3a1ffbba27a5ad0895367023db24be96cdb365c02dd77c49fa1e47866db77962a022d268cdebd156ac6e00bcfc24cd571b82b4a772a65f2f8d72874b8e8184 DIST genpatches-6.1-135.extras.tar.xz 4060 BLAKE2B 3940d48e36b2986d8e97e8cfb56bbbc1118efa61a6077eb4a0c68a8962e03bf1d9896bcdc85f7fb478ff88219f4c10db7af7e83bbd328df2077fd56f309298d6 SHA512 6ad629028fe2b1d38d3949dca050673cf89b57fe229492a9964253f6129183d85ea9200fd3c008d95b0f58251029541895e1675d7ab5cf4c22446006a9765f14 +DIST genpatches-6.1-136.base.tar.xz 6772616 BLAKE2B dbc95219a1c641003a1dce638afcb4f8fac4d291258d7e9e8723fd10835e3eaedfe6b28bfc77db5457d2484053079854ac8ae7ef28d614062ff20d0455764f4d SHA512 99c5609fdeb02c56561b382678f9e33a6fd4dbc454e3dd80bd871a2dfb5ad81ce721125c2def3571de3b80bfbcaa12b322d9a46176e17cfa4c72eafed90e9942 +DIST genpatches-6.1-136.extras.tar.xz 4056 BLAKE2B beb562de00607a2dad56c4fd338f2c5c0453d116336aa8167263547b2a48def2551b051e9cf53ae0c9525cdb280596b3ad1f740721f425ac150fb654881a5d76 SHA512 28a227ee754d258b671213a54489454134922b5d9bc2b4f9f6f51ecb2f23f237e9f0a2ec190e3aa3be46f038d5d35db1a7957b7d4ebb6eef2883ad94d1fb5af2 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633 SHA512 f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147 DIST genpatches-6.12-10.experimental.tar.xz 78160 BLAKE2B d145325c0a3bbdc93b1e7ed86f860576192aa7260cea083508efc581257cfeced92f390c398299adb1c989a513c15a5252e79e9e05737eabb89a98cbda9f5d91 SHA512 5b3b355fbf2109d83104f92486df4ad3881f1a78b3dada8285e195486def7d1668c55c797460504647e43d5a8f4fbaac7523e9c4745387c314fd1a8410083c5c DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild new file mode 100644 index 000000000000..1009a9df0132 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2025 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=g15 + +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[@]}" +}