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 534C715852A for ; Mon, 19 Aug 2024 14:47:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39DADE2A5C; Mon, 19 Aug 2024 14:47:42 +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 193EFE2A5C for ; Mon, 19 Aug 2024 14:47:42 +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 1DFF0340C77 for ; Mon, 19 Aug 2024 14:47:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69F1F1F01 for ; Mon, 19 Aug 2024 14:47: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: <1724078845.538ce2a9f59a3f49e03091be89de4f14877a18d3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 538ce2a9f59a3f49e03091be89de4f14877a18d3 X-VCS-Branch: master Date: Mon, 19 Aug 2024 14:47: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: f112511e-ab4e-4b50-9c33-8eb988be26c0 X-Archives-Hash: 25c1774dd44f87e7a33d9a1208f6dbad commit: 538ce2a9f59a3f49e03091be89de4f14877a18d3 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 19 11:32:48 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Aug 19 14:47:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538ce2a9 sys-kernel/vanilla-kernel: Bump to 5.15.165 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.165.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 718e065424d5..2bd9dd4e02cd 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -32,6 +32,8 @@ DIST linux-5.15.163.tar.sign 993 BLAKE2B c7b726dfaa4ad159c7c55454577892d111f03f1 DIST linux-5.15.163.tar.xz 126680944 BLAKE2B ae8b721b2835d158fc6610f68bdff8d95e458a2ab1f6ebf4a53b3056d251d44253cd060f817a1e853dcdb333d91abbb44fea9bc9fa5302d5ecf90b5f5546db91 SHA512 8145c55476e56355bc785fd999ae514ebfb6426d9d0d9ef937f7a8c55d6c2734e9b2221013b596cee5e01b69340533353f80d99b59a4fbbd297c37acd57be3b0 DIST linux-5.15.164.tar.sign 993 BLAKE2B 40f5b2db0e56a65fa06e1b4f46ab11356cbcbc96540286cf2cb398913823d5e61b668ed70163c7000ef4eb261f9d0d8c751427a126a6c166544284bdfeafc3e1 SHA512 651686362cc104400c40df56a923a78a1cec0817b9379363e0814f239b25e4ce42df5e9824aff5cb04f78e8899cd241f8c5086cc7a40e4c9f50d40a764803514 DIST linux-5.15.164.tar.xz 126671316 BLAKE2B bfe33ad462b81e9728705987cb29a36da3779615d24999b56d91bb5e507c3e4691731571fd0c1d6fc66822b74b7f464a21f21dd045e50c815436a4a3f64de832 SHA512 bba725254af598a9bf1047160665db25326e0ef82348e46e4da7dcd0225b0f7edc6a0933cbe6f62508b595929e81f543262b4902806e0a59fb396773ab6fe36b +DIST linux-5.15.165.tar.sign 993 BLAKE2B 4c8ddbb7540bd7b9250360c3b55d1dc6c06a3962dd6f1b0a07175529aca894569afeb3e53b2237d8bf36a091797784a982dc15f620cdd2e769a694be749a02ee SHA512 d8132e4ff4105761925a226981a64e310c56f0b1e76490be28c97648070d62b98ab025f115a09257a3e9f58b2d673a85a03d37adb64a06cc597a325f4809108e +DIST linux-5.15.165.tar.xz 126684752 BLAKE2B cb5efc3d57473da217b35f4e870c78fe4a647828031271c0300f8af11b041bd61ce6c3a0aff9b65e1fbb1af0d6895637cfa8dcc258172b71143116c940284a09 SHA512 37c8f7e88727b3be43e03d889330d70d5f3f87f7e11b9cee98e2812b5dfbe97bfe18f655efcbc2c7fbdd883e6d8d32609021aa054a6da53450490bb1c7855d49 DIST linux-6.1.100.tar.sign 991 BLAKE2B 35f2d1dbe55d66536bdab3d20f15a5b2783e972c648bb05f2edb2d8a55c1fdbfac4c79bb0ac601692e899f59d9becdba6ebfc579067b656110469ff7f3d39ded SHA512 0fd653474c3fc276ecf17e22cf95f6e6f41ba30fb70a9b98e1e9d3e67a18771cdada2fcaeb1a3597e16f0ecb44c0752c8d014a5024bac83653884b4dce01787f DIST linux-6.1.100.tar.xz 135166716 BLAKE2B c7201bd15c48d611c0eea2cb3bab528bd0fdd3e725ce1ccbcf0ecc9525f28b1a587ca9c083d6ea7e13b6df6894883764eeec5324dfd62f60bab9d7891e17e177 SHA512 842c5ee1109f6414b0173b83abf9ae0655a8bf1bf36299d86d83db1dd2a70147f7f637afe202c3899984fe340ce4633e4e5d3cb9d7b0b89014226a413bc79d8d DIST linux-6.1.102.tar.sign 991 BLAKE2B e5e40dd707a9ecd9642c81abdea16e0e15c069dd35a3ddbef77524653cc61cb21d4f3d114cdb2b6943a3de5610adad92b09b1465afead2ac134e35e84c503de7 SHA512 dce1539ffc89493358532974778e78bebd6351d7bcfb7a43a392dd2ccfa170bd8d14b51327abb99e1d6dfc055349a44c10febcac1187e52455946a920170fd58 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild new file mode 100644 index 000000000000..7dcd0d3528a5 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.102-gentoo +GENTOO_CONFIG_VER=g13 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + 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 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + 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 + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-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[@]}" +}