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 DC6CE1580C6 for ; Wed, 5 Apr 2023 18:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF894E07E6; Wed, 5 Apr 2023 18:08:32 +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 4DF88E07E6 for ; Wed, 5 Apr 2023 18:08:32 +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 9F7A5340ED8 for ; Wed, 5 Apr 2023 18:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34951A21 for ; Wed, 5 Apr 2023 18:08:27 +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: <1680718090.819423cd8668ee3626dcea9bf0931460febcb32a.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.240.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 819423cd8668ee3626dcea9bf0931460febcb32a X-VCS-Branch: master Date: Wed, 5 Apr 2023 18:08:27 +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: 1667527d-e7f1-4722-a09c-ed0fced2aa70 X-Archives-Hash: 14eff213eaf344f33ec6cc22eedb626a commit: 819423cd8668ee3626dcea9bf0931460febcb32a Author: Michał Górny gentoo org> AuthorDate: Wed Apr 5 15:43:25 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 5 18:08:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819423cd sys-kernel/vanilla-kernel: Bump to 5.4.240 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.240.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index a0e6c4afe60e..f8435f0fb5b3 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -66,6 +66,8 @@ DIST linux-5.4.238.tar.sign 991 BLAKE2B 3d404ed7bab98df22670aece56f6e105a34aa209 DIST linux-5.4.238.tar.xz 113013580 BLAKE2B cdd52b1b4bd62fcfe3b14c036e9c2170b4ffe683a81726b37d756d14e6e6d8bf002fc02e45640b09418161f09e769484e68424ed8c7eed4c4abdbb2bf07f9c57 SHA512 21af3403c7d91f5947f3d708fa173b2384869c5cf2441814f742ff414a7b83961399dcf4eb7627295c483f02ea1dd0381d2aa3a1a169ed507978b59f50d0c033 DIST linux-5.4.239.tar.sign 991 BLAKE2B 6dc901f43c6ee083b5898b8f58d1725a7ba403d26a65c06237ef6d50978619f9030132f3398a5e6ac84edfa6ea4b5ced3d026f508f968875f0f64ecdc856ca5d SHA512 9c80955017aca33cf0fbf56b230ae9565c4641eec744aa39842b331230d6be42c9b5580e45611e9302118e3b3c49846aa764cb0836657ab57a72332b1065baca DIST linux-5.4.239.tar.xz 113011896 BLAKE2B 068c6d941f4e5ddd1669321fee63a5580e551e5f07841130871201f0be51e31d228b19fdd72faf23af1831cce709b8901086a3c0206cb36e5223f818cde7817b SHA512 27b8c474803e89b3d919aceaecf885dc16298c1b82b28d5b9543d8eafc59c29a9b5e5835d4cf2c3c8175f0805aed54f115321d841dc514899c592d68e90b96c0 +DIST linux-5.4.240.tar.sign 991 BLAKE2B a3298b0e17137892a663db0ce7c492a3bacb7b2b7efa44f92a8a4483a2b7985fcea9ad16f86e28ab7ba4ee1d68822f8e3941fcd45d5cc74c368cd3af6470b012 SHA512 ffbd9efc3d55f22219ed77d1ad267663c835802b13bb4bbd2d052394cbb9a1c7046e0232c24eb681f6ff59e067c7124d838c6849e6d5f0d20af57f8ea55681ee +DIST linux-5.4.240.tar.xz 112999564 BLAKE2B 3be1fb581a205925c99ae91a7c7930beae48ec3455ba08554640c052cd4f972ea6d6a1eda14f0597571d6a8f83ca3a62d002043ebd4d6253e25cdd4dba383086 SHA512 5274e19c23b478ba2329abb20166d0b6d759d1bdf7030473f066ddf72e87c6e6ce8571f18d9803ed722f0884391919971d32cef606adbc19f10718fa2b29fef5 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.15.tar.sign 989 BLAKE2B b7232f040bc4be3d24223aff245306571b8e63243e11acb99ea95644d490598bccc02e6abe84be7007f074178b9c10fbcc87f2238f25b07ae7e091b502fe18e4 SHA512 a3212cc8b1fae98508caf16b783e6408d0abeb7b903157285fc65f49297d5f68cd0555376cee85fc50afa5ffe03330cf86055280fa948903a047f7416448182a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.240.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.240.ebuild new file mode 100644 index 000000000000..e60639c72379 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.240.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[@]}" +}