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 20CE615806E for ; Mon, 5 Jun 2023 18:35:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E963E08FC; Mon, 5 Jun 2023 18:35:19 +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 66F42E08FC for ; Mon, 5 Jun 2023 18:35:19 +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 A91FE3409EC for ; Mon, 5 Jun 2023 18:35:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6AC6A94 for ; Mon, 5 Jun 2023 18:35: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: <1685990104.751c015cc0a93f90a78e1dc2d2aa17c70d90ff5c.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.4.245.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 751c015cc0a93f90a78e1dc2d2aa17c70d90ff5c X-VCS-Branch: master Date: Mon, 5 Jun 2023 18:35: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: 3fb5eb1a-54eb-44e6-9a9c-04272c2fe0ae X-Archives-Hash: 431c51b231a5440af43b18d6be95f008 commit: 751c015cc0a93f90a78e1dc2d2aa17c70d90ff5c Author: Michał Górny gentoo org> AuthorDate: Mon Jun 5 14:33:20 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jun 5 18:35:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751c015c sys-kernel/vanilla-kernel: Bump to 5.4.245 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.245.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index b1b363f76d1e..54d391186d6b 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-5.15.115.tar.sign 993 BLAKE2B 668a30bb360c98839e15cc1f5fb4d0edf93fb81 DIST linux-5.15.115.tar.xz 126539524 BLAKE2B f31880a7155c0e8191bea0d2bfbc8faf9c1380dda83db01cb0b0b90dae7b05df1491497e5e34070f32ce7d8ab786c68fa4471e787b9da39860f3fb8658438564 SHA512 b15c96e7ce3cffb67da9071864194ae447524b6ab5c5416b7b05657a46fdbc64944d2c57697d5513e05bc505257d1309464a519a3f30e39c67103b6518c13794 DIST linux-5.4.244.tar.sign 991 BLAKE2B 777eafb4445f043a94936c89bf5da610abbd10a4ba307ff9affdf74344bb5dcec93fd8a0aa8160afdbae67b732af8131740a6e8ecabef0360fc52c475a847ca1 SHA512 85c9b095616bb45705b741f4d0eccabfe50d0571a85362c1c36575f464011c6c5949344e4b170839e603f2dcdc73ab7ca2a47ff695b41b93fcec18bf4a46b2ce DIST linux-5.4.244.tar.xz 113008872 BLAKE2B 2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc SHA512 eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8 +DIST linux-5.4.245.tar.sign 991 BLAKE2B 37fa9d8b93c228cb96e163b95d82bcbda8a0ca725553656935da4f9cd8d2d877ac74ad749c928f7ffb1a5e16a26fef5c3b4f2cb7fac7eed245597df420d48807 SHA512 d5991e7a52aa3201330c4afb0b02aef6e374ffd9cf82d6bf92d38c1418d3ac49c2b6b7f828915ade5682a33a4a1066dba5c30621639b14c787365104e03cbcee +DIST linux-5.4.245.tar.xz 113003688 BLAKE2B 837448534791aae90a437d1c815f0552f6a77c28dd6d5e101b6aab93453f6616f95a932e5c98658bacdd3b8945f4fd14dcaa1f14a8cb4740d5e9c00591242dac SHA512 17c98275d9fbb4e9abd12112d6b148615913a5c829dd045346b0eaeab357361fb33c2ab1e9c8bd438a376be75704e0bab4a41f28ec3e9a4ef898ab4e5ab8bc89 DIST linux-6.1.31.tar.sign 989 BLAKE2B 86b86704f8e01a31c70a607d572a9ec2d1014cdecb321cb1b7fac56410692697f018c6237e77cd2aad6f53758f27e8177e39065e73dd0f274d4047c4f80e6c30 SHA512 f9488296d96f54490c8a506df7018d4804725b102959b070bd0c9bc64c7ea2d517d4f39273b4ecbe975ba75d712fbf9fe0affa4159546712fc4f0f9c1bf5c3c0 DIST linux-6.1.31.tar.xz 134903408 BLAKE2B a3eec74aa6313f387d22a57d72737cae6c5e60125596fc265c0f7bd90bc95b6f5ef5192028802995a3cb50e739be328711046aadf3adc93dd2047e4b439d4a01 SHA512 1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b DIST linux-6.1.32.tar.sign 989 BLAKE2B 79d8eefb6212e8f7f3e28956fe3b384e663d57649ba57c0667a6c30fee342c2328d9a06c2908a4c7fc509835eea7f8334e33a9f29bf8f9e2ade0b361bcba8590 SHA512 2929b4be377799256133aa85a0f8de9ada79bbb8b0270b925299d9219229501f3065357df14549eb70dd6ef34a8010639dfe50efe7587af49975f0167d2450fb diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.245.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.245.ebuild new file mode 100644 index 000000000000..e60639c72379 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.245.ebuild @@ -0,0 +1,111 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +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.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug" + +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 + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + 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.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die + local merge_configs=( + "${T}"/version.config + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +}