From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1489253-garchives=archives.gentoo.org@lists.gentoo.org> 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 B6E5F15800F for <garchives@archives.gentoo.org>; Wed, 22 Feb 2023 20:12:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D22BE082B; Wed, 22 Feb 2023 20:12:53 +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 D316DE082B for <gentoo-commits@lists.gentoo.org>; Wed, 22 Feb 2023 20:12:52 +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 EA6E3340A9C for <gentoo-commits@lists.gentoo.org>; Wed, 22 Feb 2023 20:12:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A2E48C7 for <gentoo-commits@lists.gentoo.org>; Wed, 22 Feb 2023 20:12:48 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1677096759.6a0e5993508a8101add6228c97dc30e9885f3cf5.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.232.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6a0e5993508a8101add6228c97dc30e9885f3cf5 X-VCS-Branch: master Date: Wed, 22 Feb 2023 20:12:48 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4179847-2d67-472f-bf90-7f503ec778c3 X-Archives-Hash: eaf6f1eb0c4d2b55ff448f9b00fbecdf commit: 6a0e5993508a8101add6228c97dc30e9885f3cf5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Feb 22 16:28:33 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 22 20:12:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0e5993 sys-kernel/vanilla-kernel: Bump to 5.4.232 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.232.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index c88d3a5ad031..e4f52a42c72e 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -33,6 +33,8 @@ DIST linux-5.15.95.tar.sign 991 BLAKE2B cd8eb48dfa59cad29dd618573bf628d4e1555e7b DIST linux-5.15.95.tar.xz 126488596 BLAKE2B 1a8f7f8f9e75db4f6aa55bf3278c65a3e4705adcfe471868b1757349a40d73e5bb484271bc865925437fdae8f9848b976ab5c8a8ecf5992989bcf766ff25dc8f SHA512 7e983cee8c804e6cd90a812aa61777efbc4a8c102b9d2e8ffb07f22aa9d7f291dff409c359a9be0ad69959cd883633534e7a5a5af34e2f260807b13f98f1c613 DIST linux-5.4.231.tar.sign 991 BLAKE2B ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d SHA512 31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0 DIST linux-5.4.231.tar.xz 112992720 BLAKE2B 228c7135bbf38fa0a84d41607a922e269162bdb385e65ab8fcc8f66ae30d5d1ff65075494de24e280dd9bc03fa8324696ab61a556abc0cce58b31d506af413b9 SHA512 22558009d6502928bca5eb93f086b7eb37ff2e742382ba27b97e4dfc77b3b7064b0f85e78d4cba4308ddb2ed7169e25bc62a82647ebedeac1b3df6977c096c52 +DIST linux-5.4.232.tar.sign 991 BLAKE2B 0b5a5c61858195a6a51169a48a0ddf533c28e8ce32039753905e3c7d6968edf30880c8cbe12b45a3a415f9a12913da8e12573ea7a73af4f7982bfec658e38e93 SHA512 c8907a21b8f75b9a2df6e328bbdcd3140750f3aaaf60d27e9186a399100a732669987ca61435f2344c331d9b26e13e505115469581506abce8cd9da345a4b0e0 +DIST linux-5.4.232.tar.xz 112999736 BLAKE2B 238a66be2dad1dc754418fbcfbcadd74c57c4915d727b6f679dd88e5f90645f35a9c66f47fb7ee16a661b6a9575d5ac903a6b44c8ed697d2378a98c9d1a83f3d SHA512 7d4339f7db5845e9bb3dc440adc90c23b8f63f5166c19fc143979b9dc84551649c275a8ee815792818b6c20bac17349c0802e8037a74e6fcb30693cb27f94439 DIST linux-6.1.12.tar.sign 989 BLAKE2B b55e15679dbf0a29dcd5ece9cb68fb2123132818810fd03492a6d8fc5556814bfc8604b38a25dd0b71acc4ea8f515ce60d36d6e24eb944fa8a48bc851b2c25f3 SHA512 7459ad3491bfcb2dccfde4a929da7b78e842dd34e0230ba49da152891b5157dcd54cf84696988da560cc918852b1d59b76f7184d39e7c444385e20266aed8b05 DIST linux-6.1.12.tar.xz 134848688 BLAKE2B 1ff8d14fa1544a9d613fe372073e6735cc9444383e598a1c6a546177e1a9516b7f5a0d16aac4fc141fef134ffe14a0e40ab5db4200c11c953fec7f70a7bc9079 SHA512 e870aa9038f0508c50af5329721a5649c3537deb333d18f006bbf6d3c310b64262630eed5682022b7eceece9ef0956d2c110555cc9257591b7a221d063976735 DIST linux-6.1.13.tar.sign 989 BLAKE2B 6a59d32b2782eae32371c306b251d30e79c4123d53ff7587a8a02ef4b3f1b46749609561c885a6c530ee83c5b22cb9ca816e14b767790e2a25ae0e4e9fb11b5e SHA512 63c6c8af47b6c08890553e8a8292fa423be470d00322d046cc5f104ade9fedeb17f74a606ce230aca053795f720d08fe102530897b53d81004bc4d34a1497aa4 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.232.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.232.ebuild new file mode 100644 index 000000000000..0e9fbe2eb0d3 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.232.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=g6 + +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[@]}" +}