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 52BEF15ACFB for ; Wed, 26 Apr 2023 13:37:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C760E0858; Wed, 26 Apr 2023 13:37:45 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06031E0856 for ; Wed, 26 Apr 2023 13:37:45 +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 12130340FAB for ; Wed, 26 Apr 2023 13:37:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FD2E920 for ; Wed, 26 Apr 2023 13:37:42 +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: <1682516252.a3d1cbeefd2f121bb083408205c3e94e8465f113.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.10.179.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a3d1cbeefd2f121bb083408205c3e94e8465f113 X-VCS-Branch: master Date: Wed, 26 Apr 2023 13:37:42 +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: c061f7fc-7374-437c-a90d-2e49d97dd1d8 X-Archives-Hash: fb14f048578ff1c7b1d5ef301ba41a06 commit: a3d1cbeefd2f121bb083408205c3e94e8465f113 Author: Michał Górny gentoo org> AuthorDate: Wed Apr 26 12:06:26 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 26 13:37:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d1cbee sys-kernel/vanilla-kernel: Bump to 5.10.179 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.179.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index e52bfeec4662..dc39219fd3f8 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,6 +31,8 @@ DIST linux-5.10.177.tar.sign 993 BLAKE2B e692501352ad2ee680db8613b1c72cb76ce46a1 DIST linux-5.10.177.tar.xz 120593728 BLAKE2B d69e74195bf594c25e9e5d450520ca1941a360fea009a4037021608cc8fa7c95a4e4ccb8a302762324b62da2b207842d30c67230eaac44b990b262640c08dfec SHA512 27d60975e63cb61b4df1ca4419f25d9339818ea69c4275ac8066139e705eedb93b49eb6b86b4d4b59c09cc5080c1d7e9f1f083f274d94bb99d2ccf61497a2991 DIST linux-5.10.178.tar.sign 993 BLAKE2B f1c97bd8b5f3b10bddba48ef818bd5c01c949edc36a63b5b48a3a2e5fcd8d919c738e60a087418356c065411405a885b5b43bb9ad5453c861c2ea3f5d515f47c SHA512 3480e059dd578a2cd142f33bccdcd0a56b468e7d6d23562d936bb4976a264e524245111948b859acd01b1942899ec0e89e9fafed4c973b1be6410944205dcb8f DIST linux-5.10.178.tar.xz 120585876 BLAKE2B 424b8cf3b1416f9f7b8d5ccba8346ff413448d1885253ee942d9cf2dc2bab49a4f9a569aa66391caadaa14490c6c1a4c75ec272b76b58da487e314f25ec3edba SHA512 80c3564ebd5e51cdc2a95510b0f49a51b3003dcae8f71b4245edf62d3a80deb1a31c986f2820cda98841c38745e5cb2263b7d9321fbe45d1a98afe7bb1ef02c6 +DIST linux-5.10.179.tar.sign 993 BLAKE2B 1ae0cab95a1030f9491b03565dd215efbbc399abbe81dd9d4e13d6e0b8292e81f4af25db747c8449438911dfc40fa4bcd50e028e516bf96913da80ea5320f409 SHA512 66379889f5b85504da8b25eb4dab8576e7c5ab250c39d7d0cadad267d2bd2d7dde7e5f38f72b9b488746c3fe1806e68265b7db53f242154fc5746ffa06926c8b +DIST linux-5.10.179.tar.xz 120596620 BLAKE2B 556ae6eb4a4490f9c75fa4c1e062af48040c816f4bb0d6eec404f0ae5527270c8745815e6a6cfed2a6bfb43fd65e2bfb38b922f118c2e64721cf5add0c1893ab SHA512 cded7d5f6e116ab2e0caa211a3c075a9ff659495aa320f03a72a5f037baaadecd92ff1a9a8faa337f36a84128a95e24d851da844f2204877af9ed3c9602a1f46 DIST linux-5.15.105.tar.sign 993 BLAKE2B d3ee71e169ec78ec8a9a5c3579eaa504319c37b51ef41437534b92905a37056a6ccbf3116742d645ab7a2c095b39af41f861325d57d9856f96e6a587dc80c56f SHA512 720dbfc8dc4290db043dc76e0bee27276aa32e9b1c0954e28c559e1ceb03bbe8f1c828855c9a25bd644d2f99afcc21ba032fd28dd8d6dc61d283ace448de84f7 DIST linux-5.15.105.tar.xz 126525736 BLAKE2B f0175a21ada81910bf4dd176f1c6674244e8ed9294f4e19e89be73ae12e91c183479e0e0604c9c52c48f2e549ca1d4e01c5eb32a2333aefc82be8bf4160befed SHA512 f133d664431b82d995442878a155d77c624de0ccc02704198b5db27e170d55c3759f88091279cf9d91f717326b5304e0cfe0aa8253ac5d89bdeb7d6ab344b3e2 DIST linux-5.15.106.tar.sign 993 BLAKE2B be0eea3e6c2243f6535e330fa93b87440ea45a40b28dfdb5b6de72567abaefc2393542aa6553a08ad03c82774ef4099fde4d4c71fde31b33a21feaaae263229d SHA512 0a11a497ddcbfe0aab7d1af38c713e00624805d67e24caad33ceb7869ea129017eebb570d5590c51b13b1571c4b0ae6480a3bc5086de6ac713cf0165ac348889 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.179.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.179.ebuild new file mode 100644 index 000000000000..3d406f474e2f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.179.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 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}" +}