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 5049A15803E for ; Fri, 5 Jan 2024 20:19:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB2952BC026; Fri, 5 Jan 2024 20:19:03 +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 9D0492BC026 for ; Fri, 5 Jan 2024 20:19:03 +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 78B2C34313A for ; Fri, 5 Jan 2024 20:19:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CED9614B4 for ; Fri, 5 Jan 2024 20:19:00 +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: <1704485924.c1dd25e215114e2d673f4a5d9deb1fdbff5bce14.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.146.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c1dd25e215114e2d673f4a5d9deb1fdbff5bce14 X-VCS-Branch: master Date: Fri, 5 Jan 2024 20:19:00 +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: 28ccec3f-5238-43ea-a13b-f6f40f1dc7dd X-Archives-Hash: e55022b2f67027a04f6e79bc07aad4e6 commit: c1dd25e215114e2d673f4a5d9deb1fdbff5bce14 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 5 15:03:17 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jan 5 20:18:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1dd25e2 sys-kernel/gentoo-kernel: Bump to 5.15.146 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.146.ebuild | 141 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 3af6b22ec38a..9894af5542c2 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.10-217.base.tar.xz 6347248 BLAKE2B 35c610d675da3fca5c1cb187267 DIST genpatches-5.10-217.extras.tar.xz 3872 BLAKE2B 064f45be10fd871b85cf014894e01be7cc89a7a8d995a9cbc5dce54661e82b97d25b9b94c4ffdf35050dcf8784cd7a31f3fcc6531e7d9ab7f16d50f22d363f87 SHA512 ac67120c0fe629f9b184e415bc665be1234d5a9f5b9fe56210c81cfbad4a36471ec663fd51309ca616331990a30fa3b9c2a6e5aec4cb7eb11e4549ad415d0181 DIST genpatches-5.15-154.base.tar.xz 5941944 BLAKE2B b32e3bbeadf0b2b3e121d1cd017c3e77320fa8b7365e4106d6574934899ca1c0d4604370774da759a840c09693f89006365078cb77bcf1c23da5bc463d4a36fe SHA512 e32978ea17b1770d5180ebeaa6ba5f9e91e6b4bca70fc4dfced04c93aa7b6d76adf8c83c1b94a182b61fb6a5b73d3778789a0183ef9b49e887647348fadbf2e3 DIST genpatches-5.15-154.extras.tar.xz 3936 BLAKE2B 6940bf38e7c0ea4008d745171b61b4dc9825ed418a10e5d5c7fbd0ecd7a6bbabcb6c747830bc60f5d75250b826c308bb221e4720be47275e0cb653b3e21d8f10 SHA512 6b70c21c724be7e42d4e9b7ca0ee5af7aba1f7d2532ae73a571137290cebc4c6ba5146d4c0b73c9424827b876c1fba18e6b60868f09022902e0c8369b73cf2d5 +DIST genpatches-5.15-155.base.tar.xz 5989160 BLAKE2B d0b4b6b84a87f5ce4f7f22ae2b0c21cf21acbdba1de9f22839a327c1fe581023ce4b6a2886e6871220189618bd4adf865eb073388ef14b6becf8bcc8861f690f SHA512 1d7454c1e628e0f4a281c14ae0c330d69611dc96a074f25a0c6573bb83ebf4c3d6a3137ee3599421ab70b55c98f71e9a2934c45afc45d4c02b7f1c4614288c79 +DIST genpatches-5.15-155.extras.tar.xz 3936 BLAKE2B 8fafbb8cab4811a4c460aead75e719bb0cfddc8045fb64a566c4f08ad7b9c90923cb670d68d376279e08152bb08cc9e3213948f8cbdc17a03992ed0be65aba00 SHA512 2b5d8ecf9644c8f8ef5248f33bddc945edfd5ede85d84779d04574e48a39bf855d390e27107d130aa46805eb19bc825d921101832f5121f3b2073ad39b9cfe0e DIST genpatches-6.1-77.base.tar.xz 4198960 BLAKE2B 9c6921ca87ec2c3338107a994d6e094c6bf4ca5a705f21b3efa2803454327782ccf2cefa78b2a1bfa59413402d5d89b757a5522b86943c8c8c5d97592138758a SHA512 34daab45df35b30a5bc155aa82b074f6516bb1af7b2976590f88d88e25f6e8ae369fd1299f7e2f645c045b29d6b805dd07291ab45c212a9aa27df566dd6aca96 DIST genpatches-6.1-77.extras.tar.xz 3816 BLAKE2B 2129b36991f127c4bb4783a535a2d58bbe8ba9f4f139f7b70bf41a1c54bc2ac9026cdf3e3662f47c28118844ff40b6ad1c8da1c5fa8f1f4edc768fa69cae2083 SHA512 1de0ce45d9a0a1555faa92842f884cbaed8f5e727e4e59cbafc31326c9a183acc4954b2cdba1bec2019466545870ead8b5300f419533e30386aa2a36f6606a9a DIST genpatches-6.1-78.base.tar.xz 4233428 BLAKE2B 489c688bdce6b557065c5a2c63b359682ba79fc5e76665afb1cfc4c39c7451308aca9f72bb67551cba84a5b258e08e5133ed844307e51d7a47bca01d73a5cd9c SHA512 51665654f2be21a920678fe24af34f4a1b047bbe2038edf08eb68947b72e96a97daefb2b104d1ffc2d8ac691bf0624217960089b7d22bb63db43e51f2d8cc02a diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.146.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.146.ebuild new file mode 100644 index 000000000000..11ca570f5262 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.146.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[@]}" +}