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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A5C11382C5 for ; Fri, 28 May 2021 21:48:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10720E0938; Fri, 28 May 2021 21:48:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAFFFE0938 for ; Fri, 28 May 2021 21:48:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 429B1340EE6 for ; Fri, 28 May 2021 21:48:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7537A7A3 for ; Fri, 28 May 2021 21:48:35 +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: <1622238497.d0f67e7662b6b63b6a95083e90713b56bf9fd8a5.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.123.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d0f67e7662b6b63b6a95083e90713b56bf9fd8a5 X-VCS-Branch: master Date: Fri, 28 May 2021 21:48:35 +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: e0df4b38-79dc-438d-80df-c35a1b8240d9 X-Archives-Hash: 3a28c1f38a75b07a2c4a8096dcceccbb commit: d0f67e7662b6b63b6a95083e90713b56bf9fd8a5 Author: Michał Górny gentoo org> AuthorDate: Fri May 28 17:34:38 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 28 21:48:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f67e76 sys-kernel/vanilla-kernel: Bump to 5.4.123 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.123.ebuild | 108 +++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 3252203b0cf..9a40142a8b1 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,3 +38,5 @@ DIST linux-5.4.121.tar.sign 991 BLAKE2B 379897a668e4f97041f48a3a7368f13629797e4a DIST linux-5.4.121.tar.xz 109108220 BLAKE2B b1fe71ddcd3e47a653e92538ec5bf5b52bf265c4403bb856b9d0b20c60aa6abbf94db6a889f76e61e76001269f70b10600814fcd0db7ceb01089a0567ac35e6e SHA512 b68a19890ce90185e5253a635f844b59a4ee83753e4bcf89015b188af741d5a9531a07d05c4430458bec9c41c89c05c45567c93f8f68f9355bf29b973ce47d7c DIST linux-5.4.122.tar.sign 991 BLAKE2B 4c954e2fbfc89654da1646374b813f494d9a47e91122a52eb2de00cf83ca5ccc98d20c5cd3d1700e29a19012833d5ede9c220d06ba0dfd2de1874d41b8467972 SHA512 772f661535270438321e8edf77bd6d7bfb0dce0530147a2c706ecd0e6cf9006242f9138055011cb231fef7ca062b10f7c7046eb004abc80186d2629f1871c8fe DIST linux-5.4.122.tar.xz 109109228 BLAKE2B d9989903e30afea012fb46734378d2252519312bbab6c8380e53d43010b4f1a95f7cc0ab5dbe3ead700c609ea8ca0060fc67808f8a22f773dda26e836232dd59 SHA512 4b97b1754e342fc50db970883ecf1baee7f6402c5a4738bb4ce372614862e8fe93a45e5c95e2afa6c09171e6d9740400786eef45157f19ad2d7b5c110a39173a +DIST linux-5.4.123.tar.sign 991 BLAKE2B 42b98117b38e31ad2a9f0dea49a59b4d5892b127cfea6ee71b163330f3c2daed75220c6ed5c633684e30ca5d8459d841ce92d09eb41be37985cf2dd51683904d SHA512 0f0b39e279736e562aaa954b0c60640a25371b495b39e9c1e08c7e7d8d85ce458820f65693d3212ff853c1187035169b5858aeb5fe26fb0ab9e0c62ab530e937 +DIST linux-5.4.123.tar.xz 109106272 BLAKE2B 4f88e1cfd16f4cca07e9f39ab9be089dbc4df0d5741e96f1f57233a72362d0e44e4434c97b3d44d8567b1ffc1d0700516d12068d5e3e25f945d441882c20b055 SHA512 96080ffa9cdad4964effac84d8cb2f146bcd51eb88b4fe7c682b508511182709100ca22855220a00a4fe8302f6e618e148764dec9960802954a5aa43b98d0d85 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.123.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.123.ebuild new file mode 100644 index 00000000000..e11e956ef1f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.123.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2021 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 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves ) + verify-sig? ( app-crypt/openpgp-keys-kernel )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +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 + ;; + 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[@]}" +}