From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1681091-garchives=archives.gentoo.org@lists.gentoo.org> 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 130A9158042 for <garchives@archives.gentoo.org>; Thu, 17 Oct 2024 18:50:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6351FE0977; Thu, 17 Oct 2024 18:50:19 +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 4344BE0977 for <gentoo-commits@lists.gentoo.org>; Thu, 17 Oct 2024 18:50:19 +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 3852A343078 for <gentoo-commits@lists.gentoo.org>; Thu, 17 Oct 2024 18:50:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77C791E06 for <gentoo-commits@lists.gentoo.org>; Thu, 17 Oct 2024 18:50:16 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1729191000.c17caf8185351fa4cbe2a10f9faf7e7e7cdb429a.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.168.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c17caf8185351fa4cbe2a10f9faf7e7e7cdb429a X-VCS-Branch: master Date: Thu, 17 Oct 2024 18:50:16 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63ab235a-07af-4c9f-9701-4ce0d1d820eb X-Archives-Hash: 279b44ba51935bb0f2f54334f00e4883 commit: c17caf8185351fa4cbe2a10f9faf7e7e7cdb429a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Oct 17 14:22:55 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 17 18:50:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17caf81 sys-kernel/vanilla-kernel: Bump to 5.15.168 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.168.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 4e09f3ebd03a..c3bdc4052e5f 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,6 +31,8 @@ DIST linux-5.10.227.tar.sign 993 BLAKE2B fc17d46845bfca6a917cfb7801217132d157aa5 DIST linux-5.10.227.tar.xz 120717528 BLAKE2B 160b2b9056c9b2fa6a2772c57ed8d9e072372cdc71efcdac93f46f348ab7c790cd11e391b7fce31115dc9270d4dccdce9f3965753d4266dda7a12630558a5bd6 SHA512 163fcc3a2aa15f6a3f5f0148ce3aa6bc650df0a763c6b0a76531e0bcfc164f69a1653043650d030d5e5fa3cebce4f63ca68d05db02166fbf00b77d3ebbf679f3 DIST linux-5.15.167.tar.sign 993 BLAKE2B e3a74697c175bc3b6944b05a754fb015edb1137d053039b4d122d43b2ed02c55218736835877f37bfbddcc42b115259049d391dcaa4ccc319b445ed9b21d98d9 SHA512 c42daa300b5b95ca1b3e5c1874e0112ea66f2c4d51a2d2df59ac0b3094945a39f98324d75b53a2e29a564ce2a091376dcbc8ae0166df78aa73042d85552fc605 DIST linux-5.15.167.tar.xz 126681812 BLAKE2B 24acaf9a064f4b2af4a272f49ad63ac565fa55408d595f4c15ebcccd8a44a2ab964e5bfbb9b9b10f765d741da541c9e3911aa7dee3164c091b203cd06c5ad08b SHA512 3ce1848fef40dcee6de3808574ab236c72799aed5aa5a295d169b45ed529e254b43df81c9d9b15902723d7316c3d1af366aeee815ee9be985cd2d380e360cf0b +DIST linux-5.15.168.tar.sign 993 BLAKE2B 90d6895485802ced84e9be9d59389d3a7b0b1e7ce4beb7127c86cc06265a8fb6b0ca195219a76edd83cc8951a21fc1b294874f36582bf96c8c0e447c06d2e8ad SHA512 0119b75a97054d432addce1ce8c02924bec10e516d7e16c24ebd6f19afece14e2a26fb0e1f246b5a890da18c75d9f68afb51d6d0bf41e6e5a3e96d3f2cc5fe29 +DIST linux-5.15.168.tar.xz 126712868 BLAKE2B 72b50433e5c242d0b21ba104306ba632b24afb87f2166c42fb049c03ca91d631cb2714d98d49641eb4b457f6defd0d42fd438273916393cc60e417cc82f26e42 SHA512 8536e628c801ba0afd0c142748966da9b8374d1cb578ab518c9efdbca3d416bd0bb6393368569e1a868ccb3f74d2f56e12216cf43f79f3047b55f670fcd3d42e DIST linux-6.1.110.tar.sign 991 BLAKE2B c93c23243b3f9df9da66cd9c3d1c65d6cc09212b53c3a19d4a565ea9566d2831938f3aa6c25b88fe7e85268aa0bcac8bdd5cfac472d610b95aaec2ee2b39181f SHA512 9fb593858e2af689e2e1d5171e70f2b707a4bc77ae721e6950115877b084c49dee340e77f12bf40761793a2cde306d513ca2e151e3c159e55906e129d458b8cd DIST linux-6.1.110.tar.xz 135196940 BLAKE2B a4d78c86f74c0684a3ec53056241900a0fec06862fa47b963085ed7e797a0c5c8dc8d9b5e6d83d5da412e8ae8f820bcbc2f83c2a049ceed81e545fb0733ad582 SHA512 48c9515d32bbba034e3a477554bac627f131533a9b47ec55c8ded5f464c7e57f0f27c1f34ec92403792680d1019baa4472b2c55892c5e1d8edfd04cf7bd79eb4 DIST linux-6.1.111.tar.sign 991 BLAKE2B f65cdcfcde31e4e281af4f6efbaabaec9f347d1be4b801e839e372c608fc8cda925ff4fc7da6e2f4c495c0ba8bacb41b5c4540e97f1354225a5884f7fae9e7f2 SHA512 4a575810a76953383fe9a20071f3c07af638537a93edf10a7cbb452931666079d99314a15b15cd37016ff9e73057dfc23686887f1f044d7d7116734cb64f4954 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.168.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.168.ebuild new file mode 100644 index 000000000000..3e7046d330c0 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.168.ebuild @@ -0,0 +1,134 @@ +# 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=g14 + +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 -xf -)) + 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 + arm | hppa) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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[@]}" +}