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 D0D6B15838C for ; Fri, 26 Jan 2024 14:14:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 751CEE2A0A; Fri, 26 Jan 2024 14:14:41 +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 445CBE2A09 for ; Fri, 26 Jan 2024 14:14:41 +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 285ED34330E for ; Fri, 26 Jan 2024 14:14:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8772D1492 for ; Fri, 26 Jan 2024 14:14:38 +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: <1706278463.9fa407772b8e136aaba2b8390d50a8ceb8f3965e.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.148.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9fa407772b8e136aaba2b8390d50a8ceb8f3965e X-VCS-Branch: master Date: Fri, 26 Jan 2024 14:14:38 +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: d065be55-edfe-4bb6-8eb8-b564fbc21ddc X-Archives-Hash: 67e300447ae671a5dbd7b443dcd7e1bb commit: 9fa407772b8e136aaba2b8390d50a8ceb8f3965e Author: Michał Górny gentoo org> AuthorDate: Fri Jan 26 10:11:05 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jan 26 14:14:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa40777 sys-kernel/gentoo-kernel: Bump to 5.15.148 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.148.ebuild | 141 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 17bba3b21ed3..beea0c578eff 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.10-220.base.tar.xz 6420640 BLAKE2B bc737c88f1e7eff80ccb12513dd DIST genpatches-5.10-220.extras.tar.xz 3872 BLAKE2B 71384eeb192c4d3ef24e28cba7848a2e51ec6b582d0904593902f15d8f03c33bd4155e9ec8b52b601af399bccac2c52b3892109dff151a89f636d9f130306e02 SHA512 e8b61757336cd513bb7c49725c569218a749ebf6782515a30c63c1d9ac922f8781ceb6d5399437889a281ac393970c09fd8bf0327f0de45cb8de1d604d49fb0a DIST genpatches-5.15-156.base.tar.xz 6004636 BLAKE2B f70c2a3bfc3d65fea8d4764b953d147a1725162aeaf319701a3d4b1d47c846932c4c8cd009bf81b4ce33754e966dac4630e2f690c403ec5181e3cc122496db09 SHA512 4d2fd08626d433d7230b27fb1cbd8a3fec9a942ddbd01988dba8632f25b510353b5086f4db1d529b88770e579189fc7bf6a4d02828c662fcb230e51efbecad9c DIST genpatches-5.15-156.extras.tar.xz 3936 BLAKE2B ad08b5d93b943236326d333c627ae8cd279d78fd2b8f8df420ce75be815472dca9785b8eb14015ca2dbc92560a8589d31b9f9edbf81280c85d1ce6fe58aed0b1 SHA512 580ba97a039ff7417b448d4df13b67ed262b7a47be449515ca80125a89b5da3eeee773757db6ff7389b501daee6ab708e19dc2713088ee118859e1e9d3f4b303 +DIST genpatches-5.15-157.base.tar.xz 6083340 BLAKE2B da2898a405bfd934e761180064107f4d87d144105ade4c825ff9299cb4a0b57324927cf34d3a55fc7a0227d9db053caf5b0f8159ca0ddbd946d31459b2683e1f SHA512 04c2d322ec1f0946b7f0f551e0fc0342da749cade5f20f2da1a1e60fd0cd946593a797c053bbd0eb8121f70e69f6766f8c945a99fd77fca3eef89aeae6d5b871 +DIST genpatches-5.15-157.extras.tar.xz 3936 BLAKE2B d559b4c240ab2b8a0b522d846c3d9707b0beacd800e137517c29b51253283b47caf05f7facbdd7be747255dc2485170ecfad04a3ba5293d749c8d22ae60886f7 SHA512 e99880adebd2d08067fbcc73bf01eb844c39cef7c06e99b95c9622949e38a2ed58045f27e71bde4d5321dc06212848c884c8f4added4c41a8a1197cd375091b8 DIST genpatches-6.1-83.base.tar.xz 4358680 BLAKE2B 0ef9de04e2bdbfd4cdf2942ad1e1b27b8a314b07409cd7c140d0cc2783679a135eedd7d08860ed9fb6256115dbfbcbab5cd3d15522733bd72ec3d4d918fdc96e SHA512 544630385153defad073422da90ec6710d0b4e3444ca1843017b1f1b855add852045c0a1d7e8cd68c037746c4c23e8ec24df747469e177519384ca2e8185cfda DIST genpatches-6.1-83.extras.tar.xz 3816 BLAKE2B d22ef26f4b321319ce84b7bac4b345759519ce1bf4b821fd85590021f93c80242506b4ebd3cfca6ad4c1e56dc8d3600e54a0b459f07eabe0e154b03a0a1bb37d SHA512 086b04be251177d98038fc2aab2b4110aea45144996b3e50d7803e331a5660cef9e4c7d6fe794905dc8a22065ab8ecf4b5eb5f94e8db59df88a2c861c09c2505 DIST genpatches-6.6-16.base.tar.xz 750868 BLAKE2B 13af5286f51a69dd0ad7b2543bcf0d933865e14c4c865e495f3225a8740bd7579858cbbd72a2099333e8dc241900c166730d4c812183f2636bf3d4049156a71b SHA512 70864a69f8bdb28f8fa3515a33be510a2c529a5c3bc767aede2dae1c290869491d776336be9983259685af9fee2d2bc61c821d0103c47e91b69078bf81fe2c63 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.148.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.148.ebuild new file mode 100644 index 000000000000..11ca570f5262 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.148.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[@]}" +}