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 A271E158087 for ; Sun, 16 Jan 2022 17:09:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6E3B2BC022; Sun, 16 Jan 2022 17:09:33 +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 8F7872BC021 for ; Sun, 16 Jan 2022 17:09:33 +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 B1664343007 for ; Sun, 16 Jan 2022 17:09:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C9CF2A3 for ; Sun, 16 Jan 2022 17:09:30 +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: <1642352962.678c57d574c8c52ee32f5b0edd7ca2ee1b55f70b.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.172.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 678c57d574c8c52ee32f5b0edd7ca2ee1b55f70b X-VCS-Branch: master Date: Sun, 16 Jan 2022 17:09:30 +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: 8cbb4e9f-f5cd-47c9-87dd-6e142f6e7ebf X-Archives-Hash: 98c4e6eb6426a310f8d88193fb6beb72 commit: 678c57d574c8c52ee32f5b0edd7ca2ee1b55f70b Author: Michał Górny gentoo org> AuthorDate: Sun Jan 16 14:53:20 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jan 16 17:09:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678c57d5 sys-kernel/vanilla-kernel: Bump to 5.4.172 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.172.ebuild | 107 +++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 27fde36b2fd0..5c7a1f182ee1 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -51,3 +51,5 @@ DIST linux-5.4.170.tar.sign 991 BLAKE2B 225477d94c3645baa345a528c341f8e4ce4c1326 DIST linux-5.4.170.tar.xz 109202572 BLAKE2B 92c93457dd5cbacd2522ef71f3f5ad1ac97521ec46966ed8f46fd9ffbeaa986bd9c0ceaa96187e1b0beb76daef98ea0af1e49c2b7e92759fc7ffdf5a90204aba SHA512 aa2a36067f9015b63254e098522053993de4b31dbbf39050adbe4cec3b7e4249152ad5e154a9bf3ca2b2f60c4db274e8f4ed9df9c66d8a392653dd5de79554f8 DIST linux-5.4.171.tar.sign 991 BLAKE2B 3ec7e90e82689fbccb4f3faf8e50d2cb00af2227ab9af1942029d630e0f2a1191595a203d6b6a2d982d5a2d5b2a8c4f65ed87a31918df143255f4b1be5635d50 SHA512 1e78c9a05f4ee3317324c71563030132138284a7cd5aa0156e65b1fd8ec783a3d35a68129a3dc956c51ff464a1b5b38d363eaa08a36d505114dc4a04574ed3e8 DIST linux-5.4.171.tar.xz 107901796 BLAKE2B 1c47d9dae77d40ec6eabcc8d64e73537b6100a6f6b1d85b67022d6a223170722a1ae856fcf65665341b33d7d8b9228b88425e48d92110bc107f4657f37e4b74c SHA512 a9819c35cb92de25303c254b3e63cce16b58282dad06bde57b20bb70691fa255cc303c22c8718e95db73772b39bde5a9ba880133732879d03afa358042acd0d9 +DIST linux-5.4.172.tar.sign 991 BLAKE2B 5543340217a1a9eb3ed3f794cb967b1103adb63eee8cb22fee80886bec687df97d8ffc38f6b5ce046f0bcaaa2c1f223e1295ff7f9b141170aeb6521aa6e9f3ae SHA512 7a8ef86a8522324c425f3e83650719958e6f556c5abd7b8c33c03d42af211f5132cbfc63e3470c55f5322ce069e3df9a97ab9393739c56d79ce1316fb7b830cb +DIST linux-5.4.172.tar.xz 112866632 BLAKE2B f14a0eb9e31c534b6b038c5a0fb66aaa57b2047e707675c53245da6435c146191c1ea974ecd7001a8539e34f838eb90d68a3eae22368b0d78ff02e380d2f4e5c SHA512 a6b84f5ac4323d6e1daca9af449ba310e54a296752b50d88a999b804c38afe25e874ae336de3c8bb6a6c92aa2ea86f10c66ad8e574c6ba757b5b818de86b8e84 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.172.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.172.ebuild new file mode 100644 index 000000000000..a68d501c5130 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.172.ebuild @@ -0,0 +1,107 @@ +# 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=5.4.114 + +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/v${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" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +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[@]}" +}