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 EDB00158090 for ; Mon, 16 May 2022 19:57:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 687B2E08A2; Mon, 16 May 2022 19:57:06 +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 37D9AE08AD for ; Mon, 16 May 2022 19:57:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0F176341C9E for ; Mon, 16 May 2022 19:57:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBCEA475 for ; Mon, 16 May 2022 19:57:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652730953.973098f3d831e8656408761caedc3e70cf95c30e.sam@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.40.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 973098f3d831e8656408761caedc3e70cf95c30e X-VCS-Branch: master Date: Mon, 16 May 2022 19:57:01 +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: 688cb2a3-993e-41b2-aeec-57ac463aab77 X-Archives-Hash: c93b6c0dcb3e038c89ee38ec1f8affaf commit: 973098f3d831e8656408761caedc3e70cf95c30e Author: Sam James gentoo org> AuthorDate: Mon May 16 01:15:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 16 19:55:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973098f3 sys-kernel/vanilla-kernel: Bump to 5.15.40 Signed-off-by: Sam James gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.40.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 81eda4ff5b4d..bb7e8691f6f9 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -25,6 +25,8 @@ DIST linux-5.15.37.tar.sign 991 BLAKE2B 224f222dda3d7221a32b575ae52fe0ea36cf5315 DIST linux-5.15.37.tar.xz 126314716 BLAKE2B 41fa48151cf9ba20aaf9161ff1bc48a890a165107784e41e9e7535093ea7fb833ed5d0ff75534bd721ff1c80dc52d55b3585c3473917c665ee4d0f107d7e1e41 SHA512 afc84a10b96e70b859ec328f8d803d7e270264c8649492899292b92650840586c08e1df3196af41c09185e68f2d400cdc302bd0a474cd4ee86c34979098fae48 DIST linux-5.15.39.tar.sign 991 BLAKE2B e1b9446d695c20140108320471fe9f6d9c95a0d525ae1e88b5a4acfbb082afde83272461befca10e253799b088cbabd856256d83856ac03aca0e5cfb4c787f63 SHA512 30951a220de1f8cef56d2f4267d12fd78f03a966b11af0bf74b4521c746147549215a6d435c130f230685f2bd90500ba47fe1b178cf5aa560e3024ba10b7de8f DIST linux-5.15.39.tar.xz 126317316 BLAKE2B c2b7e8e944e30aca07b70355a89b86e15756226e8a13826e749b330668cca28e0caf758c1a4f8166590d5a26ecda49f665ad0caab4c800c599e857fdf281ce3e SHA512 712608b95a53ff3ae31313c518614c1376a809d621d845bc23f096243f3ea509a11e451b14709ce4ed48b964547f177bcb20d57e62806938d129e0187a2cd296 +DIST linux-5.15.40.tar.sign 991 BLAKE2B 0fc23aa789af5570448d723f11e6503c508e9485a32dd675cb9bc45b3685294a6b175d6f95d5976ca0996c6d2d738cca8720f68df27bc57cee84a02ecea763e5 SHA512 ca2e4d86175736613e6529d97e2be6fd3b06300aa902c21fce3b8ad809f3085fdd4cd3ca3e0fea40fc86439238ff3422b9950ee82c6cc7c5bd642bd453f275c3 +DIST linux-5.15.40.tar.xz 126329200 BLAKE2B 5e6b6948a137542594011918d059fcef49fb13b35b99a3eff57838257a97749534a568a2caac7f97ca9d8d0685a6e73be9c6b5494e0a67bf45db49e922c37069 SHA512 2cd0ef9f0932bf5a2a400a467687937cc5164cedd79ec0cf726921249e1d540a9ecc99cd8edb3e8ee74ebaa7a131dbf19886f5e858bf7834b59779f0d110dbf8 DIST linux-5.17.7.tar.sign 989 BLAKE2B 8e83a92b4be4a20521051e04ca6229aa72441ea1634e7140ce28049f569a8e9a91a963f3aad816d8ffc89e1e43ac7f0346f9230dfb7eea6b67f8ec4f6dd7b36a SHA512 8c3de748ca7d1ddc25932acca0d4dfb1e355ff77cdde9add0f6f9f911313b0a6ea797e44e8c9813bf97d7cc4bbf4d34e71c19b940daa0bf226bbba082fe09666 DIST linux-5.17.7.tar.xz 128454448 BLAKE2B 1c1b1f59404becef201c28d6677a2a52a828a51903d0fe5b38a931fa25694d766eeb222b02f674d95ea8c67c29e0f3420b88f94bdccfc2f9bd575c2605e8f229 SHA512 c70ce704b65bba14237e1ca042add6ca075b08d65e9b90d5441962ee2e6a70a58da72ee847a17917e5d170021933eea6b681a5774454f2228b2153e76b440c97 DIST linux-5.4.191.tar.sign 991 BLAKE2B 0897c615b6b49b0d18c2c3f3bd6767b706c5fde582c6cf2954f4ef91756b11d8d10fbe5c83ad616208ab5fbd2bceb64b358b3aaf87f4678538e85096dc9b22cc SHA512 f18cf2d5bdc7d2c60bf5d2057073e4a0afffbb0673b809b98ab80ed203a4ff292fab45ac8a6faf1853715f5e3155afefbc663aff28f31166ad17a629157c6a31 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild new file mode 100644 index 000000000000..0ef902726d5d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="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/mgorny/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[@]}" +}