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 B3A8915800A for ; Wed, 30 Aug 2023 18:20:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A5E22BC022; Wed, 30 Aug 2023 18:20: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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F170B2BC022 for ; Wed, 30 Aug 2023 18:20:22 +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 F19BE340B54 for ; Wed, 30 Aug 2023 18:20:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5499B10F0 for ; Wed, 30 Aug 2023 18:20:20 +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: <1693419604.6931b31a1ace014a07a325c8fdbc8273359a018c.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.1.50.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6931b31a1ace014a07a325c8fdbc8273359a018c X-VCS-Branch: master Date: Wed, 30 Aug 2023 18:20:20 +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: d503b64c-ba24-47f4-a1de-4407aaf26fae X-Archives-Hash: 1fadfc849d492c183c914febd8f588b9 commit: 6931b31a1ace014a07a325c8fdbc8273359a018c Author: Michał Górny gentoo org> AuthorDate: Wed Aug 30 15:28:29 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Aug 30 18:20:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6931b31a sys-kernel/vanilla-kernel: Bump to 6.1.50 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.50.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index eec71f4753ba..2b77be4f67db 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -44,6 +44,8 @@ DIST linux-6.1.48.tar.sign 989 BLAKE2B f6aafdf12eeb8e1e781e839b29530acef36220bb8 DIST linux-6.1.48.tar.xz 134962064 BLAKE2B b0f4abe3dec9c95ef4a51df92a0f2101d7114485798df58ecf3f4310190417fc8ec38f48aa3e022ea276b6267fe1cfb7ccfc4b999128adbcf47332769063e2e0 SHA512 edc8d9017bed9fbf3817fe5a907cd31e58ea76b9d9570016023181ec91f0183ff2eae2ba4887c44756b016b43181ec3e1d658777c95540de694db0525ea9b9a1 DIST linux-6.1.49.tar.sign 989 BLAKE2B 91ef75adfe55e76a4ddc7c2649d483bc34724379ddd3f2c4c3ec1b55999954772af35aadc54d3c18e4212bf50e65b51790f842e0bfc14e07c84e0ce3fb1565ec SHA512 73b8c84427b01def808ff3828c0cc911c7caf3312de91aca211b973ad2eaa7c51842f183b2fcdd1241532ef11cba82fc214243791c66b828d032d14999945588 DIST linux-6.1.49.tar.xz 134978048 BLAKE2B b1bf16f3b9617ae3eddd41cdea7ce07344e2ea8d9c516b151c6184bdf2611a619f8f3592aad013f32499f0b90edf490dd8e80eabe56174399a24e6502c1bb817 SHA512 30a5fe355bdfb9b7016cf44cdf0e44f7118154fe06958a2d240f6c741e23a7dd41d0b7d79b35b2eb25ba0ab87715377f29df32b05004c11d889fb84b5ab523ac +DIST linux-6.1.50.tar.sign 989 BLAKE2B aaba4a2613ea96a54fe0374f31b55b68769eac82ea4f7de0b5d2841a160b996a16a47f210e0e10327a13d1facd10e2549cabd40d3866bfe22113d4465101d54f SHA512 4c50cde4b0d226b352821f562ff79e520158a365ea17e5596281b460fb6b0be003d094b2376a277589862b96438bcf431c83b42049b78ab664d146e16736566e +DIST linux-6.1.50.tar.xz 134972988 BLAKE2B dfe44d14a1f8773776338b46b4416ca2240eebff4e9e954b4b46c3ac050cb424eb2d3dc3a856193d9a79216c2ef970ce6982d122ec0226a896984c7ad0690f31 SHA512 d0157286886df388f752e367e30254cc7f615cd7f6e435a99f43055d143490edac316a5bbb826a0006ddc4b550376d67b624693faa5504fab160969806c81607 DIST linux-6.4.11.tar.sign 989 BLAKE2B b8b55a05aa9d5249365a17faf7c0654d6172988ba2894d6bf21c33a8c175dd220cce190415f84235175eec729a05a85b25f2ce9f240e59f81172823ed3a60eb9 SHA512 c4d218992809cfd6ed6afc324cddae579bd2d1cec66f40d04c1d182ca4dbfa8487539cb63b2ec432528b28f30b9e156fc0ce243878ac8c6607cb1e83c01b5888 DIST linux-6.4.11.tar.xz 137836952 BLAKE2B dfb97f2c9905a150c0890b9c3d464bc13986bec7bcd038c333f4dce443e0a1988a9075554219f9f419ef71af98827c05fad4a62aba1e58aa7f2ef8249f140175 SHA512 b3abf1d7c6b03644ddfc0a1994c88abd9b6db71089aeb4ff8749e9eed5d3772bc3468eabdeec99d998ec091898e5c81a84ef839345ba368580509500a3cc73dd DIST linux-6.4.12.tar.sign 989 BLAKE2B 598b2dd8b0beb25db5b0500547bfcf7ea669c06ff4afaf6252f996d0bb519f5d19da96a1b618ae7a03c4e27a56a5a1540d2c1b66bef9683d14aa964e0d768d39 SHA512 d1941097b97dee631cec1487ecdb9a3a4c145ec8cfdac325776e9e890bfff2f559140d178fe5ec27b0482f04df2713cb2d6da59e20a7bdbce8ed50c148f3b585 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.50.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.50.ebuild new file mode 100644 index 000000000000..e3a0c5f7f691 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.50.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 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.7-gentoo +GENTOO_CONFIG_VER=g7 + +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=${BROOT}/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[@]}" +}