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 0E3CF15814C for ; Wed, 11 Oct 2023 07:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 581052BC071; Wed, 11 Oct 2023 07:53:23 +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 39A8A2BC071 for ; Wed, 11 Oct 2023 07:53:23 +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 52993335CCD for ; Wed, 11 Oct 2023 07:53:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7AC21115 for ; Wed, 11 Oct 2023 07:53:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1697010495.fe37ea79a0bc6d3957e21becbf0bc92788682d4a.sam@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.135.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fe37ea79a0bc6d3957e21becbf0bc92788682d4a X-VCS-Branch: master Date: Wed, 11 Oct 2023 07:53:19 +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: 7453c893-e218-4871-b35f-fa8aee27177b X-Archives-Hash: 51e78d25dbaec1bbb3dcbe4cc5f9e4c5 commit: fe37ea79a0bc6d3957e21becbf0bc92788682d4a Author: Sam James gentoo org> AuthorDate: Wed Oct 11 01:06:17 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 11 07:48:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe37ea79 sys-kernel/gentoo-kernel: Bump to 5.15.135 Signed-off-by: Sam James gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.135.ebuild | 141 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 7801fe5e151f..27502cb903a4 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.15-139.base.tar.xz 5486908 BLAKE2B 9bb9dce583643bf316d24dd741e DIST genpatches-5.15-139.extras.tar.xz 3932 BLAKE2B 57659070be3889530d15448b8c38961fb4e45f307ed0f9bec896c70ee3bbdc133136fffe0f4f2e268bc96005766c1d662912b0d27077e67f917f4b30458c7694 SHA512 ca2599baa4e1462ad723b0a2c28b8e73a961a0b1b71a27344eb20a7e89fd1607454cb349d3c4401b061813fef395ce395f2cf6e52a75c249e6d22228a0c0466f DIST genpatches-5.15-140.base.tar.xz 5551752 BLAKE2B d75b41c5bd5c1d92df5057a73fc8474eac6b20885f0417efb23eed0bb365932560b47ed73346c1d32c4b8cef1cb8fb3c64c3188244f4faad854826aa41ed81be SHA512 56c3c9f3d4acedc4cc89f4666e13d807d89471ebd59043cf1a9bc5e79123be7c34fbdc289e7136a6dcbaea14c94f6e86b93ea680c35deed8d7ee9e9a9e457211 DIST genpatches-5.15-140.extras.tar.xz 3936 BLAKE2B 006d8787d59e0c62258d3ec071bed673a6c43face73907ab659dc4791c305532cd4db79a5ab6513117470825c10a17582c96fb6a111bbebd1251be21cea123a9 SHA512 fd0b5fb681d5d7a67780ac85915e6fe7c06528ee7353f95f4a51d1dfb70ef654428b44be603f1a011355d01ee8665acec050d9e67758af267bc557802cd647d8 +DIST genpatches-5.15-141.base.tar.xz 5572792 BLAKE2B e062086d50d08b67c21c785b086c4bc0878f078ac6c10cabace2ebfe388af3497d2b98bb2e5d19d4b5791e78456bdf0e8c479121eb8c41b4ca2fcd362ebffe4f SHA512 1835684a7737d61423ec0778316b46fedea491a8f5254d9a2d630e5a78519d61d22dfa0d9d6ea1ece563f165c0d54c748f23bca5df304ad45338c27327e8b2c3 +DIST genpatches-5.15-141.extras.tar.xz 3936 BLAKE2B c51e1f9dcf3995a2e178d8763407dc94595e513f02d96d54dc1b71a34ada0eaf46b6cb1cf4bebd39b4776605532df529cf8ed361480181af516ab889f915ee5b SHA512 5eb1f68368de87df9236bcf10726cd3abcb75a9f59579e9810b9ea53f3ad332d345a3da7c1be61826b6b739aabb11a838d12ba7be3ce2cb890e094433176b02b DIST genpatches-5.4-264.base.tar.xz 6232296 BLAKE2B 09955b4c773e8f945a83f24ba79d40c62eddcba3c207f3c91dfe0e1e9e4351b916bde2bffef862f9c7adecea63a93a9390736010dc2f4784848c467208c4d955 SHA512 2effdb90bba04a190c2e88af5548c5a66b5144a92927c6a56c38b1e556beb2cca63804842ccff3889b243a1f47d9b4d91d8288c17fce36b9841bab788685476b DIST genpatches-5.4-264.extras.tar.xz 1812 BLAKE2B 5fe283f8ae6572dfc1c156baa6574c1ff172e05772b3e74352f61af9c4165f02544c62c3378a42fa0cb4167daf59b4f2fd95092d9cb459efc44f3f18e695c03b SHA512 3fb7e314a03c4f370efb47e97699d74d8b8b3d562fc3619e8b71c7431168d30875d5bfdbb826c2bb5b72d4e752b28a2b0b2885bc336cf5470c5099b2804f04cc DIST genpatches-6.1-62.base.tar.xz 3593184 BLAKE2B b9ede84287025cfb00e4772aecef49bb1528e3d47a4bfba110dc019ea94ed6319db1831ee765a497150e410e0d66029317c9859e951672207664345750531d5f SHA512 e1f5c54758b001cb9c4be6fcf0e92ad95cfe213b32186be0160bf5980ce1c6a77150f26baf89bf5e23c10c9c96df6ae3b5d77e2d84a4b792a93bb968a600fe58 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.135.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.135.ebuild new file mode 100644 index 000000000000..eca1afb33d22 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.135.ebuild @@ -0,0 +1,141 @@ +# 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 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g9 + +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[@]}" +}