From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1551663-garchives=archives.gentoo.org@lists.gentoo.org> 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 3D694158089 for <garchives@archives.gentoo.org>; Sat, 2 Sep 2023 17:35:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAE0A2BC028; Sat, 2 Sep 2023 17:34:58 +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 476C42BC027 for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 17:34:58 +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 58EAE335CCD for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 17:34:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2921110A for <gentoo-commits@lists.gentoo.org>; Sat, 2 Sep 2023 17:34:54 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1693676079.e029f38dbde66d30c6a0bc4536102c47be57fa4f.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.51.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e029f38dbde66d30c6a0bc4536102c47be57fa4f X-VCS-Branch: master Date: Sat, 2 Sep 2023 17:34:54 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8b55887-d7c3-49d0-a835-9293b0d530f2 X-Archives-Hash: e442e38c998787701b5e0aea96be0ab6 commit: e029f38dbde66d30c6a0bc4536102c47be57fa4f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Sep 2 14:16:12 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 17:34:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e029f38d sys-kernel/gentoo-kernel: Bump to 6.1.51 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.51.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index ff5fb458053d..9412f5a4e602 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -22,6 +22,8 @@ DIST genpatches-6.1-55.base.tar.xz 3230904 BLAKE2B eaf52b27c1fbe9d25a27b18bc6eb9 DIST genpatches-6.1-55.extras.tar.xz 3808 BLAKE2B de074120fec5b94a8378313fd1c14166ea156008d679e53fe114d2a477ddc8f83e2b64ead63a7b43fcfcf4f168225b8ec2de7383b8749c661b493139560e35c1 SHA512 88d6c13ff77590b1240e7958cefa8fb1f738df2b56aaa2ef2e8b63ee4d67ccf87c3da3a9fb6d781009d9c9a8db4907418a9af2f634d92d858fab4f33afb745c1 DIST genpatches-6.1-56.base.tar.xz 3326400 BLAKE2B 4a62be88a16883b13ab169a93933a638aa61ca469fdab5f4a474a68983dfdca256bdbc4e62bf7b4ccbed48365a966c6396588444d45ed210a3dfefc8677a3ca5 SHA512 5c9d46528036cd7457e825dd97d7c20c69cee3f6d0279b82b0f45a3ec707d15a74afd270a0084e3438948a47c3128cca4ce2c53d45590c0260dd3b4324206287 DIST genpatches-6.1-56.extras.tar.xz 3808 BLAKE2B 647f53e02a9a383d96beec781f33892f015302609b93f6d9f8408ad1e8b2ffb423d01f0f540365fdcb795e493bc1bc493c390a218226258f6ac51e8fc8bad657 SHA512 c4bf617db17818a615b279a2351e5f369c9efb256b30e2581210c57758ca519eff1d8a320bbceefc5ac8784e530476dd2db7cc559e7da99c3d1037d1ce69e663 +DIST genpatches-6.1-57.base.tar.xz 3329956 BLAKE2B d43450b8139d3a37aa248d8b5af3047d29cc8a16346512633d6ebd55c8adfda8a165d707051e4bf5b167830a711074e9fa4fd2038c04505ee455a6a43686eb1a SHA512 1917b2d9026372ced986e2572f9b1f99633bd61154855547283110279d3feca3fe2326d200bda75c61a617ff61a5758032bddbb4fc37dc403384bb76e060bcb3 +DIST genpatches-6.1-57.extras.tar.xz 3808 BLAKE2B 39e1e8aef7db1d76f770bdee410c6b26bc7bab3e6c7b3e7ef342122d83ac8fea8bf1975887bef6ba1be2e99035f2f233ff3267c05a1e6d17ccf282ee26c4eba2 SHA512 027cf468cd29d927f620f013c2d1461dbe4877f587d8e4fcd02dde085bbdbb4f0f1ffb5cd23a84ba89ce9a5425144eb28a72415b2998bad14ea8a589316f32c5 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0 DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.51.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.51.ebuild new file mode 100644 index 000000000000..7e128b87c8f2 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.51.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2023 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##*.} + 6 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g7 + +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 + + kernel-build_merge_configs "${merge_configs[@]}" +}