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 3817B1581C1 for ; Thu, 11 Jul 2024 14:35:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EACB2E2AEC; Thu, 11 Jul 2024 14:35:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 487ECE2AEB for ; Thu, 11 Jul 2024 14:35:34 +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 66DFD335DEB for ; Thu, 11 Jul 2024 14:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6CAA1E1D for ; Thu, 11 Jul 2024 14:35:31 +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: <1720708511.6a466fca384d23664dc51ebc17b49be467358697.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-6.6.39.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6a466fca384d23664dc51ebc17b49be467358697 X-VCS-Branch: master Date: Thu, 11 Jul 2024 14:35:31 +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: e746728e-0e10-4ec2-bc59-5a2a3b884e86 X-Archives-Hash: 78ce6ff9fda75b0522056f88bd2f7a52 commit: 6a466fca384d23664dc51ebc17b49be467358697 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 11 12:03:05 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 11 14:35:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a466fca sys-kernel/vanilla-kernel: Bump to 6.6.39 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.39.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 16c89502021a..f4d7ca234767 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -40,5 +40,7 @@ DIST linux-6.6.37.tar.sign 989 BLAKE2B bf4db9046bb721ea6020c967e67592fcd0c6fbc3b DIST linux-6.6.37.tar.xz 140257932 BLAKE2B 26cb9557f774b294c67f7562ecb69b4f8ed717bed59a2386385a814e18fdad48e05a94ed0c29290791f7494fa4cd0168f412bb463d69a8bad9ce71d7d7e5429e SHA512 04f7048d62b369bbe12d3a5c3f421834354a7eabf5a8819d22d9e7450d3b52d763c98a55c203f6d2a2b01163d1e5f95e52beea1280586e452fa6e7c22ac86f1a DIST linux-6.6.38.tar.sign 989 BLAKE2B 747f1b7bb8fda1a099f35c0c0dc3c169a086236d3ae288eb50ae915f22018a0760aa9c2f24b9bd9d38c924a9c2887fe5fef0ee8735beebab2d818588a2a0cdd4 SHA512 e79da8f3497a38afca1a431fe33da0362795408437ee66a565fe533802c2fc8debbcbbb9852900d81264861a9b4ed55e45f68515ddde051af885d811d3b622ab DIST linux-6.6.38.tar.xz 140247952 BLAKE2B 0aaea98cc6db13bdfd9515f43a1714f6c7297b71c1de3ea6b2e00a2dd9ede125c141aed4c09989096f4d3321144bc8ad03453357e08a9346f52198f4ddd14440 SHA512 744c6830594f9989daaf2f76ae70fec4ae09a50e21724696926185636b55c22c9a83c2e7ba3632b6e26cfcc3f2f800fa8b2cacae0c8288dcf79ce202dcfc7033 +DIST linux-6.6.39.tar.sign 989 BLAKE2B 95beab3aec919809a6185822ea669dff9a19b30d5a505a073058f617d5e07290bdc32865d002cef93ddc43b3b41293933a5119940642ce175a542840f23624e2 SHA512 9dc378231622ca586242a3d06b566711501e2a84271020b7b2b4d57beec05d63e1fa357828f5cca98a1d3f1c49e6119b97c6fc4bba3bb0982a1bdc7795215b6d +DIST linux-6.6.39.tar.xz 140291004 BLAKE2B 995aa17bbdc4a15499be6d9527b1df79ea72a8f8074526c06cad04ec7d4d94b7091ce3e1b87b5bbc7c27e9641b4fa1e13b2a7b19afb36f1768233021d26ea270 SHA512 fbf1e27f7fc68ac42dd2cb40f853a77d4b2aeaee0190beededd39d4251b206a0d2f6784b4b5aafbe21bae36669bb00e20235b15ba4dfe84231968334dc65e71c DIST linux-6.9.8.tar.sign 987 BLAKE2B bb81040fb2134eb33ff7f0f9d9d18e827d3828d53fffbccdcaecbb22edfef04309a2f42987220552422735af5a6f17aad603d7a5fd4c7dcb9ba2d3659fecfd8d SHA512 7de43543511a017a135c4b33fa511fbca060097da13be2a593f9b912b7388d9e3b025854ddb91518cb5e96bd77befe7ea86f5766db2515db7c39addb0409ad99 DIST linux-6.9.8.tar.xz 144093812 BLAKE2B 3c3874b053d7076564936f2053ef666733d329c402999aac736cf64418cb74e471cf9d7ae62e8fab49e4e916f196c5b8317aa243691b1d18119a25196108dd06 SHA512 e7616207a1f08100cbfd9a3cd08bb0ea6cfd474c3a4cb95b3bf738461b7a8ae128270ba1bbaf512ae9c0eb2a409fa0c1d79317ab6dec9ff317aa9019c86d0c62 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.39.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.39.ebuild new file mode 100644 index 000000000000..2de327030b51 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.39.ebuild @@ -0,0 +1,143 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +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.6.12-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 ~loong ~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 + ;; + loong) + 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}