From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1546504-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 272BA15800A for <garchives@archives.gentoo.org>; Thu, 17 Aug 2023 02:54:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 550D82BC02E; Thu, 17 Aug 2023 02:54:43 +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 371C72BC02B for <gentoo-commits@lists.gentoo.org>; Thu, 17 Aug 2023 02:54:43 +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 05F66340817 for <gentoo-commits@lists.gentoo.org>; Thu, 17 Aug 2023 02:54:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DE59FC6 for <gentoo-commits@lists.gentoo.org>; Thu, 17 Aug 2023 02:54:39 +0000 (UTC) From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org> Message-ID: <1692240858.aa62aa62622269a8e818988b45f9e3a6bbcb4a3c.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.4.254.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aa62aa62622269a8e818988b45f9e3a6bbcb4a3c X-VCS-Branch: master Date: Thu, 17 Aug 2023 02:54:39 +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: 9849427e-ec8e-4a48-a923-3d0b4976b401 X-Archives-Hash: 23d895be9b438d8c98da3d209f78c1c5 commit: aa62aa62622269a8e818988b45f9e3a6bbcb4a3c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 16 22:20:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Aug 17 02:54:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa62aa62 sys-kernel/vanilla-kernel: Bump to 5.4.254 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.254.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 1efff50433aa..d96fb16472b0 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -54,6 +54,8 @@ DIST linux-5.4.252.tar.sign 991 BLAKE2B 2861b4b71d0a75b204ad8b89b47c30f62dd8b217 DIST linux-5.4.252.tar.xz 112967820 BLAKE2B 098af6c7491cae10dc17294231887a429b713fc6b77c6d6db4d4a01f20d002542286a6261456f108db12e2d797f75670b7d22adfed544658f285d3f98b4eac9b SHA512 59a71c176efa42643c1b6563e168dc364616b8fbe6f5b72af7a6748976c6958c7887283cae0da33eaa0f006b8b5ee581665d2b1109e046e6a6f9182b600833a5 DIST linux-5.4.253.tar.sign 991 BLAKE2B 206d1a46df022960344a4e1588e35a0a9967aca4da45c49f7ec7c676455da61cd82ddd7caf8f579bbbe7013ad39bf636855384fef765f887251aa22bc651858b SHA512 1bdee5d5a5efd2efce01ce69c03db7dc442e5e4dd28943995d0a58eee1b82ec39f3648cffe804af9e46004650b712e161aae0c3f386a5542bd9f815837f8971a DIST linux-5.4.253.tar.xz 112975564 BLAKE2B 03718332e6e43fe3302a45e225084e9436b23d2e92657f34db826b37637a6c39ed50ff94a6d8a5234157b40a60924763c44c5c18495a82621f82a1e55632cb55 SHA512 68564c805dd912200ad926eec1e7ffe15f52eb57357f88b301b2a09debfc971ed62e98032b1b1a6696f82c45f2341d9c802c5e44be799109e1550c063897c647 +DIST linux-5.4.254.tar.sign 991 BLAKE2B 4f5a5e4ea2c930a62e3743c4f10d8e9999530a106134c61635f2f1fd627e6cb375a6d21a2f66f0bc02bc99e419cb0a4db3499af090f8787f523e009789205007 SHA512 71b4b3777c238034d5624be9ad79f40634d2e861ae2665d2aee1701cc3d5a09e6a5d1a114642d0d01a97cf1556022a658fc3deef7c59e93ab9b41c829018bfc5 +DIST linux-5.4.254.tar.xz 112963588 BLAKE2B e0e395636643c49063cc1fbb04e06476ecf17471818f909559dc8f77fa5de69b8774ab8d6b16b4a2a57f32a7bf90126d381360fdd52069fc435090cde07769f8 SHA512 ccd82451c72eef0a0f35eb8c0e296e3018573ab99b602cce0a107bf2514bccf93113ea86d16205cb1b6a9f7c0198d411a250b215aed3cb0b4be6fcd27b878039 DIST linux-6.1.41.tar.sign 989 BLAKE2B 7b7cfd294a3d204134aca76464dfb596e94ebdd7d7657888157dbf217b462c7f63eba2081ddf29cd906323656aaf6dcba7191c7aab3ae4b5347817ed84efce02 SHA512 1918494a78e94b4a4d92e871de8fa003386e08c62531110147a7b11b4e682618a3e3a70591ef768fd5a9050d578899d272bcc4cb2873855cee8cb867dd5780b7 DIST linux-6.1.41.tar.xz 134912480 BLAKE2B 7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe SHA512 82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91 DIST linux-6.1.42.tar.sign 989 BLAKE2B 043e225f5e4f885cca43839bc17cb6cc721635ee0ece73a983d2fdef9a82f0424e6f73f1b83666354293cd874bd6fd59c05ac49babca6244a2b6aae7c05e7008 SHA512 adcaa387bb4bd236f79f486e654b115acd4a7bff27887cc08de9b4b791659a73d55f090817d7686fdbc410d5bb9fcd72889c43048c979b65f88ff9c9c9ec8358 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.254.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.254.ebuild new file mode 100644 index 000000000000..e60639c72379 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.254.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[@]}" +}