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 154D4158020 for ; Sat, 15 Oct 2022 20:31:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A02BE08BB; Sat, 15 Oct 2022 20:31:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F7CFE08BB for ; Sat, 15 Oct 2022 20:31:26 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B82C340E96 for ; Sat, 15 Oct 2022 20:31:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1E41613 for ; Sat, 15 Oct 2022 20:31:23 +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: <1665865869.dbc73bdd070fbb46c3b1c1aa19a5d259d0eb12fa.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.218.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dbc73bdd070fbb46c3b1c1aa19a5d259d0eb12fa X-VCS-Branch: master Date: Sat, 15 Oct 2022 20:31:23 +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: 6cb619ac-2691-40c4-af93-6cb046adb434 X-Archives-Hash: 1e42d9aa02258f4cae6c1a05d389ab47 commit: dbc73bdd070fbb46c3b1c1aa19a5d259d0eb12fa Author: Michał Górny gentoo org> AuthorDate: Sat Oct 15 10:51:23 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 15 20:31:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc73bdd sys-kernel/vanilla-kernel: Bump to 5.4.218 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.218.ebuild | 108 +++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 28737226397a..c148a29071b5 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,3 +34,5 @@ DIST linux-5.19.15.tar.sign 991 BLAKE2B aede577f11f17168beb5a24e45cbc3f4ade60c9d DIST linux-5.19.15.tar.xz 131651164 BLAKE2B 1115c4b6d279d89b8abdbe847a748e89ebcbe127ad99465190e10fe7f72a9546f42c0b627f0633b99ded6a23e22ca696bbd92f4387b43b5beaebc2f894d3ffab SHA512 55c208be24d4851a939fd91285b05e968a7c8be5aa29a92f0b2df5622b4a05ffd43a158f92f6f5f872119ea99b9ed67286c225f6dab3b9765672f7475ece686d DIST linux-5.4.217.tar.sign 991 BLAKE2B e013f0bdc76cd45a30b9868daffea48537cf6c11479cf1622cf062f52400b4c9b02aa7f963ec7f8d977c32a012d2d99cb8c78e7c07f165b4479b5f4c306ae70e SHA512 99e380d449b8005c721d6150b42f8424a4b034ed61c21c3c6c5dd488f42837d064690e448c3ea03aa08928597602605b560d629d44bac44f09b67f129b7e4866 DIST linux-5.4.217.tar.xz 112963732 BLAKE2B 42e028707aaee1526e5d608173206c386bc02c130410a7127efe7b97a3af8dc98ddb25688cc894df2c1124b81924471a764202d53a35b4177beafef21396fe68 SHA512 f2f7c0843f73dad58d00a283327bbf1aa4c103db7b8b7060ab58013e084601a4603632d6e43a4ea2d2958a5ae20fcafa6b5ae14a11da00b4185028b50c427909 +DIST linux-5.4.218.tar.sign 991 BLAKE2B 821db66087ca8264ce3499cae2113868341f8ee176964b8dac7a156a62ce399b3dfc1ea4a199a7bb3e2f8d509087397dfb3981bde83226557529af835fcab512 SHA512 3eb5ec1f2ee535c3c6ec9c9ac021d3339a953cbc97bddba178491267a7ff19f2c73d89aa9b7c1dc2b851e27e83e4c5bbe1c67b66ab8a1059bb851cf178fa4af6 +DIST linux-5.4.218.tar.xz 112926060 BLAKE2B 4900ba1d0aabe61d2877d1b6ebda695e8ee5e1a4fd9ae3dab7010435f21a3cbd98fd36b8994f10eee1816b6a6561b958a2da176eeaf67309bf24fd90ff190df4 SHA512 51adf248105706eb30b611496baa7cc35be16857f890ac5ffb031373bf0538b6fdf3440c8b753b0d33aad6ec84ab2ef859585e79e65c470f5b4c9d728763aab4 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild new file mode 100644 index 000000000000..ae90752d5ab5 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2022 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=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/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[@]}" +}