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 526C8159C9B for ; Sat, 3 Aug 2024 18:11:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41049E29B5; Sat, 3 Aug 2024 18:11:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 271ACE29B5 for ; Sat, 3 Aug 2024 18:11:05 +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 47C00343028 for ; Sat, 3 Aug 2024 18:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51AAB1D9C for ; Sat, 3 Aug 2024 18:11:02 +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: <1722708650.e1b65416e83c1a3504ab1ee5a136544a81a7f174.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.44.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e1b65416e83c1a3504ab1ee5a136544a81a7f174 X-VCS-Branch: master Date: Sat, 3 Aug 2024 18:11:02 +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: 7639c7cb-7784-4f32-8725-135c5fde4616 X-Archives-Hash: 6192e9df33b9430c769318f0a9fefa31 commit: e1b65416e83c1a3504ab1ee5a136544a81a7f174 Author: Michał Górny gentoo org> AuthorDate: Sat Aug 3 15:55:09 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 3 18:10:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b65416 sys-kernel/vanilla-kernel: Bump to 6.6.44 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.44.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 0f7ece3ac2ea..180190c1db61 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -78,6 +78,8 @@ DIST linux-6.6.42.tar.sign 989 BLAKE2B 6a97f25355d99bb3e85c3c60ba349baa5a7ee80dc DIST linux-6.6.42.tar.xz 140266944 BLAKE2B 7a4537d37dab44dd04b973ff2ec3d2fa8407d270477213a745c50a624bca0370bd7229dbe796e4531ec4fa2731cc8b32bce1940a43f62d53d1d57aa51f5f9785 SHA512 3e7d8cb2e2996c19f6964eac9b8addfd083487c6eda59c89bc791fab486351fcd31bce8a4cd2feca30b9db220d117106e9a207147dc35a17381d3a94439412e9 DIST linux-6.6.43.tar.sign 989 BLAKE2B 877809199e96598c321932c142aca616713e3b15ea9c05bc12ea9656fd38b753248b5d32325d4007b0f0dea8973a4f13e977b2caeb86b8ffe079428ac79867d4 SHA512 edd688351805d19a8527f5f7bce8065c05421dff60bbed22babc296c06fc13d570b0261d6abe1ff82b6c8d71f10d1856c44c47c6cb5d453309465d570927b40b DIST linux-6.6.43.tar.xz 140281980 BLAKE2B a3725c336374b173a1f4ba03ee2cc2772e5f1276dd065df039b561d2a88a9bb5c552539f699168a0967613d94f2d4461e0944d2d8141f22b4ee04d660728f241 SHA512 013027b921184cf7fee360e930472689c0ad202e06b4ddcc2b3207f52ea6244890d9ed267ffe5590335501318dd8386c873f038de875a70d637a58f1a405a55a +DIST linux-6.6.44.tar.sign 989 BLAKE2B 58ca0b79641a39af5b02e989904ede39fb18f14bbf55374b98fe01839eb3d4ec3572a8661c7c6999cbc79ebd6a88547ce8c25d59ba4b835d371c62d2365575e7 SHA512 c546f1101c58683f278cb9fd683faf195ed6b1a95be917d8058d5c7a7a4506538b2c03bd618b9dca796bee0bcc42035ae98e91311f96f6160e6460b38ea68b87 +DIST linux-6.6.44.tar.xz 140323036 BLAKE2B 52c7e474021f4288175477b613e04490471fc365809c48f25effe7a625db61e3599dc8c46036b250d0ff25c990eb9d9591f59f07a81ff73c83df81ccce751250 SHA512 75ea5973af1d9994c5bc7d4538a314100ffb9daf40c98cbd7eb4f409ceb5d007abc257cd7017221817f2a8d8f097558e7498a90b88ec2f3b4a611eda8b794fb4 DIST linux-6.9.10.tar.sign 989 BLAKE2B c91b7e7d5d49fb3bc7563bfe302cbd1fef504da6ff151d4d96ce54a7808989c6c3064bf383e579e702c497bbadeb66e9658c18a75edef3382bbf5f2807e5f825 SHA512 95530a66459c94ad50106f0ce15640ce997aba320eb711031aad99c8a9f5a9006052a298fadfacb420550fdafd749e24a8c820d31c7315b65143e82c2d818161 DIST linux-6.9.10.tar.xz 144133252 BLAKE2B e08cce7f271cfda05c5ad777d06cbb04b57fdb7992d10d24f9e0193cae185d02881cc089bab14639a058cae12d1f89ac79c7d0be528c077d8b09d385dd3fa616 SHA512 043885652363f935049744585d72fd7a1fac30baa6fc222f4ef8ca95b66d0ebf0c9492fdc9208009a849527076d1f6586ea557cde75aaa547e46e624ca759625 DIST linux-6.9.11.tar.sign 989 BLAKE2B 18272102fa858d3869b2b7a9482f557558c68170ff7893cb0d49740789afef627f7b97e7fd8dcd8c83e09a7820c0745b40687ed41bb5ae7fb1ac612b2683fabb SHA512 b725a88bc1617bf888d15921e6a14fa7b5433271372daacc6631a692f993e1d5be553acc1c7f9c95b5b54d1f9a57d5cc05e36e8b5b2aeaa3aaee8ecf4464a08d diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.44.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.44.ebuild new file mode 100644 index 000000000000..2de327030b51 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.44.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[@]}" +}