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 91B40158086 for ; Wed, 1 Dec 2021 16:33:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B841CE077A; Wed, 1 Dec 2021 16:33:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66F65E077A for ; Wed, 1 Dec 2021 16:33:17 +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 A1018342E73 for ; Wed, 1 Dec 2021 16:33:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58DEF200 for ; Wed, 1 Dec 2021 16:33:14 +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: <1638376385.6580373620ac14cca089aebe2c039b128d3d4ab7.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.83.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6580373620ac14cca089aebe2c039b128d3d4ab7 X-VCS-Branch: master Date: Wed, 1 Dec 2021 16:33:14 +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: 850f93da-b7cf-457c-bb95-a501851bd7be X-Archives-Hash: b1b767d565e1fa6c91795d5b4b031d11 commit: 6580373620ac14cca089aebe2c039b128d3d4ab7 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 1 14:02:33 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 1 16:33:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65803736 sys-kernel/vanilla-kernel: Bump to 5.10.83 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.83.ebuild | 125 +++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 0ca2a41f5532..830ef79ec8ee 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,6 +38,8 @@ DIST linux-5.10.81.tar.sign 991 BLAKE2B 0f685adb5138de72e354b9bfcf9c682d06b4e8be DIST linux-5.10.81.tar.xz 116457928 BLAKE2B fcbdaef750463481b71b0caf7922451a24a57de65bc9ac455feab5117489db513da9d3ec2c59638d533993c6bc47cbdbaa909cce3b14f9de1b47b817cd344ee4 SHA512 f7c4210412757dfac367f8266d2b9a61685d349f0067be07352ec9774ede7f30d7a8cf3ba9366a1a259c8b436e3d257a15a89e1a93a7acbed34c8d41d81bf679 DIST linux-5.10.82.tar.sign 991 BLAKE2B 8afcd05c0f186667b2a4f4ab9bb5d2b2f7dff9f021cc9658d45d38221f38e2584ffa39d3a4ce28cbe435247fb4b620b36baa1be830dd5cb051507788ae4f4f54 SHA512 cb5a615815a19e2ce79997295c40b6cdf352b82be39c6d3ee4dad6d2320e82c167736d7c2b14b96edb6773e34738d3079bee9dce385807714f38470860b6ab1a DIST linux-5.10.82.tar.xz 116458148 BLAKE2B 2ef534f9209886387460f96eeec9ed3fab6b99da6e263ddfe5ad099b8f55b0b278e443c6c0e1547577512ad97f135a4161c7005142620dcff7b8991e4f3e9c4e SHA512 5446e0161b6047f3bf9d5ad09b24349c4670841603e6aed00d078a13b9ff8d45c95d8a881741467bf91e5125f78c685ec13bb61a56ea3ff6760c9e79df0e1b45 +DIST linux-5.10.83.tar.sign 991 BLAKE2B 08fbe80290cc213bc358d6b858fa9cde7d52f1d0e6269a4d23b139e2f2a65b00ae8db13b4c384c894cbdb1ff9bf7178fd2bfa3705df0e1151ad5bc7a7f620969 SHA512 ff979566db9f1b4b3c779d386f81c97a0d59337cc7cc0999ac9d89f9c65fdf60a386cb2021db8395b76be483a5a26a7a36e649d890552f3aba2285776029eda6 +DIST linux-5.10.83.tar.xz 116455992 BLAKE2B 6c7d946269f59498574d1b8c6688accf06dea5b67d4eec0b5d3a06b6d33419f3425eaa0a923cdcbffd11efaa2b6057ffac71dd13ad9083d3b9e7bb9e82014713 SHA512 63a4dd3dc72d55d02f6f50c12316e42b1bce45f90a0d704d76223c8ca75f66ebbbe17a7819cb1a6ff9a64844f92a84c4591096e230b363bcaf2b59c4f22ed278 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e DIST linux-5.14.20.tar.sign 991 BLAKE2B fa20d7bdb19b223294ee48d85a9ed8077ed81be85a0fa50a50d357d1440f4f832d336d0a1bb97f4cca11c70de206cb142d1c15781adbfb73d16a740e59c34105 SHA512 2ea744e2ef312303fde620a80d70bde1f3f3ae3991e69e78464809456f1d17587c9a745b64c3c8cc5e2cab41962a9674be4a72baa6d0dcc5cae0e0ce18199850 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.83.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.83.ebuild new file mode 100644 index 000000000000..73b31c51857f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.83.ebuild @@ -0,0 +1,125 @@ +# Copyright 2020-2021 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.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=5.15.5 + +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/v${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 ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( app-crypt/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 + ;; + 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[@]}" +}