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 280B915808D for ; Wed, 20 Apr 2022 17:24:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9084E09B0; Wed, 20 Apr 2022 17:24:51 +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 9716CE09AD for ; Wed, 20 Apr 2022 17:24:51 +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 8ABC4341C21 for ; Wed, 20 Apr 2022 17:24:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A1EF3C7 for ; Wed, 20 Apr 2022 17:24:47 +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: <1650475472.e59a24c1fe06a31e0aea6093ad65c968ab45ec8d.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.190.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e59a24c1fe06a31e0aea6093ad65c968ab45ec8d X-VCS-Branch: master Date: Wed, 20 Apr 2022 17:24:47 +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: 66ea5fb7-5d80-42c6-ae19-30cbe2b9e82f X-Archives-Hash: 36fcc25a25f3d267e8434438232fa7aa commit: e59a24c1fe06a31e0aea6093ad65c968ab45ec8d Author: Michał Górny gentoo org> AuthorDate: Wed Apr 20 13:25:39 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 20 17:24:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59a24c1 sys-kernel/vanilla-kernel: Bump to 5.4.190 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.190.ebuild | 108 +++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 49ea5dfdab2e..6af341d8ba0d 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -57,3 +57,5 @@ DIST linux-5.4.188.tar.sign 991 BLAKE2B 544964d936af5ac8f877b2fd9fd3e858e1ea7bd8 DIST linux-5.4.188.tar.xz 112915792 BLAKE2B a2ea3b6c84edc952b8691903243464489b57284d8e7b49ff8d99d8790adadd1489d2d36ce36e4f357118ae5a61effc9f13eccfb97070ea99c8bec72344066aa1 SHA512 fc3cdac63f2add05662561388197380622f5da24d4683d8985e942d04a8f898f38a9dc53b2b045d32f2070494322d7570ffaf4a071a311bc99ea018d81d2ec88 DIST linux-5.4.189.tar.sign 991 BLAKE2B 2bd2150ebefb85b131020f2ff35bc097b4f0a1e940d33eaa83106280f52708ab746e98e5a9b1aa7a916df3e510ca8c8f135459d84d323c57ab7468dd83ac8770 SHA512 70783540fc1b6ff3aef9362b5e558dc8e7dc409aedfc26b6dc6cf57611d9ce8474133472e61402453a9b53f197c22e59fa8f6b5cf86e6fbbe0cc3365c094ef8a DIST linux-5.4.189.tar.xz 112926600 BLAKE2B eeab8f72f69c6f18c7e1134bda6912c5b6a3f24abb4094a5659ed7540ce0caf4319cf091e347b8094700684eab09f9e04522749de6d3d4abb791cb12e4ca389b SHA512 0fefa437bf2fe20108abd0681dd9dd94ef4a81442bb791267e76ec41397f2f8d0952e62503382af5a57c976395471792f91b76357aef1a6849e0966f0d211987 +DIST linux-5.4.190.tar.sign 991 BLAKE2B b53c0a463190550b0483ae118562df54524e50c9cb69b6b05e3d64c2987ac8381c6155b08314e1c7c60817b472d80a8e4e843b8d5fbfd736b57467dd6c5c7fc7 SHA512 374791542827682bf40d0239f8821d94e1b01441b6ce7f8f9404cd7d7b27cf2bbf223cf8ded2c697caec9f52e3191b0046263e3dd2a682c728315d924a37799e +DIST linux-5.4.190.tar.xz 112903892 BLAKE2B 4762432dba452b7330f9e8c0c969fef64f6f86fb0faf918f28c96be251867b23bc584c79fdb4347938527568db4b32c804f7bf90e962748dc4020ee11625e2a5 SHA512 d2e74174d71aefbdd297535b7657aaec23a3a60376f6d5236e38b210306f7092b3be13a834d12f140ac356ecb3fb7df8a9809393d21d96d17e46e9088cc4b91a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.190.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.190.ebuild new file mode 100644 index 000000000000..4f5f7870ccb8 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.190.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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=g1 + +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/${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[@]}" +}