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 8C077158041 for ; Fri, 1 Mar 2024 20:42:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18EF4E29D8; Fri, 1 Mar 2024 20:42:20 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92BEBE29D8 for ; Fri, 1 Mar 2024 20:42:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4238A343110 for ; Fri, 1 Mar 2024 20:42:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A19DD14EB for ; Fri, 1 Mar 2024 20:42:15 +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: <1709325363.02f4e5ec498c21313ba75ea2794598f0b819991a.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-5.15.150.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 02f4e5ec498c21313ba75ea2794598f0b819991a X-VCS-Branch: master Date: Fri, 1 Mar 2024 20:42:15 +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: f89b49ca-2937-49e5-a7e0-616b1c050ab1 X-Archives-Hash: 4acc7f5c76884b7f2e8b18df1d38cc7b commit: 02f4e5ec498c21313ba75ea2794598f0b819991a Author: Michał Górny gentoo org> AuthorDate: Fri Mar 1 16:55:13 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 1 20:36:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f4e5ec sys-kernel/gentoo-kernel: Bump to 5.15.150 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.150.ebuild | 141 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index a2baddb69c9c..2dbd0758547f 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -8,6 +8,8 @@ DIST genpatches-5.15-157.base.tar.xz 6083340 BLAKE2B da2898a405bfd934e7611800641 DIST genpatches-5.15-157.extras.tar.xz 3936 BLAKE2B d559b4c240ab2b8a0b522d846c3d9707b0beacd800e137517c29b51253283b47caf05f7facbdd7be747255dc2485170ecfad04a3ba5293d749c8d22ae60886f7 SHA512 e99880adebd2d08067fbcc73bf01eb844c39cef7c06e99b95c9622949e38a2ed58045f27e71bde4d5321dc06212848c884c8f4added4c41a8a1197cd375091b8 DIST genpatches-5.15-158.base.tar.xz 6218288 BLAKE2B 04f37b07da08635e59afd941a96df1f55683bda62fc72258005c23fac7048995f670376b57a0d4dadaf2018d1f5819da5239c04bec6c12e0e50c3fcf24c451e8 SHA512 b7d29d8d1f58b3cf534494ace74091042834f6c237667d9b1ae4dce194e5fe7ccef1269560b5edf4fa4eb4c8b9dacdec7bd7cb96bf22e95a93be7946f7cc2b36 DIST genpatches-5.15-158.extras.tar.xz 3940 BLAKE2B 2ca5435d7d4399266b607653b0f884d02d19f216015ee93eb9fc03571ce20a712f50a50adc876823d97d3233da870afc3e7b6602ed885e333ddd178d63632810 SHA512 9718e9a9e1d41e444afd1c08524027ab63a95f9368a8a8f9fc38e9d40585384172e116a1a2362155501d2561fc9e42d3fce69509eac21daff02b89f83e351f38 +DIST genpatches-5.15-159.base.tar.xz 6297632 BLAKE2B 104b3e6ccc068842ab71997f3421a507f67381414bfdc3f32ab0398f5a9786b843f20c132d5e265b57cafa4fb377a7b765438597d7b8d05eedf64a9c84cb5a8f SHA512 c6a1cb2ae1ab256442c3f76b41eab243e22be37510ee5e051d40bd95ec716921ef07d6171e04f645305cb0b83fbd54e06250e6a0625b92f1a313cad4bb170f18 +DIST genpatches-5.15-159.extras.tar.xz 3936 BLAKE2B adb536a978a0ae1a2327142d7e7bde2871b1b42017d04b3302d40138b80a6fe72faa957c30437bc71c7eaaea1da0ccce1baa244ff62e71581c7775ff066dede9 SHA512 452d9370dc10481e2274261c01a5f9ec75086906158bd30f93314e2af8c095060d5a6760524c21412aa4752ca77d4818e1879c5d3bbd9378a63d56ab2cb9b3f2 DIST genpatches-6.1-86.base.tar.xz 4574456 BLAKE2B 905d051daa077a0aa697ae78187ccb149c5e14dd2d171e451d85559b68ac0a4e8a80a3b13332bc2c8b58d8be182b12853b9e784adb307987faaac5d2ef43ebf3 SHA512 7d28fedd6a157a680de9c69d11f5d243c02b5714e0570bbac9d429ed1e5937bf7250cf5825d6365debb0b0621301cd4999dafd0680e4815e47ea1452ace3e406 DIST genpatches-6.1-86.extras.tar.xz 3812 BLAKE2B 6e0dfca04eea9e737e68e8bd94f246628ac5a3e1ad911c41c7c61ce33baaf27b42805af53b0e7969d902078fe989e2b3122d92445b721f92209f5fa5a79eddbc SHA512 4daa5eeccb39c9c033541bb5dd123f16358f0a67f0b087ed0ed22243d46d429a7695f05bdaf84a229f3f483eb73b688b5dcb18110a87f9ad22b84eff24f765fa DIST genpatches-6.1-87.base.tar.xz 4590376 BLAKE2B 03810f1354881a70c49256a9b71651016c78aadf9d29e82e6077fec4d3a46487c530a987ef6785e78b149fe7f9c1f235f877382cacee59f6239366d4ac3bc5b2 SHA512 dd828b301272d8d0d80a9f51ce0b9b31f493b482af2cac7ab66b1307e3df44d88c7df4b968178d876bb6770b8408346a307aa5f22118f2bac7a35a045659a195 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.150.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.150.ebuild new file mode 100644 index 000000000000..11ca570f5262 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.150.ebuild @@ -0,0 +1,141 @@ +# 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##*.} + 9 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g11 + +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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( 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 + ;; + 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[@]}" +}