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 3D24B158097 for ; Thu, 25 Aug 2022 15:30:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33141E092F; Thu, 25 Aug 2022 15:30:45 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00CAFE08C4 for ; Thu, 25 Aug 2022 15:30:41 +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 EED9C340FAF for ; Thu, 25 Aug 2022 15:30:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3704957B for ; Thu, 25 Aug 2022 15:30:39 +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: <1661441423.3262cebf0e38715c5601bfae1d3b24543dd3d2d3.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.211.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3262cebf0e38715c5601bfae1d3b24543dd3d2d3 X-VCS-Branch: master Date: Thu, 25 Aug 2022 15:30:39 +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: 44d08f3d-94c2-4e57-8011-a350dd49da44 X-Archives-Hash: a8cd7a9424fecae52d2cc64a4bce8977 commit: 3262cebf0e38715c5601bfae1d3b24543dd3d2d3 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 25 11:18:35 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 25 15:30:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3262cebf sys-kernel/vanilla-kernel: Bump to 5.4.211 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.211.ebuild | 108 +++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index d18ffb79e8f7..14f1604931a6 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -54,3 +54,5 @@ DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd0 DIST linux-5.4.209.tar.xz 112951528 BLAKE2B 26d3ed24f2e9686a200cad3e1f12b01e8e1344a09d445270bc2d1af39449300b30ea66d88ed1d22b39b4cafaf05d6d924f6d24fa47ceadf704a5118d5621bd2e SHA512 bc09ca7a004fd1804320d5908c85fe92e1bab820df8a61b95b06c85e41701d172333575f470ab49fd4918df282281e77cf074c2bfc44744baf6967acf32d2f58 DIST linux-5.4.210.tar.sign 991 BLAKE2B 90ca190c2bc1e939e2aa61116f5cda649e8b16d7882aa086f63e060e6934956489fc6942baa3f6c0021e0c94aa10c9713687fc352c210d83161a9baf0bd08275 SHA512 ed9bf42de53d190c0cc8f63775584a83a7a1911a0b22611d166d616c81de88c7d70e472397bac4653bed2f971208b229ad6a9cd884fc72ddb296175dd5ec91dc DIST linux-5.4.210.tar.xz 112939860 BLAKE2B d02e73a6c1e597cb66d36995b7419a8bc1de876cd3c797c3cf3fec63b24b111d2b4b6b0578929ff947fd9613227ce9b804a3e0fe3e6b9d00b63bb74ae5c66bd5 SHA512 c5511c912fb67040e319b9f64927d9405d2368b85cbc139bd289a6c13eecb6ba2cb5b217ba18fab3fac8117bd9d8261b6c4333e6684970ed82a579c5f9702cd6 +DIST linux-5.4.211.tar.sign 991 BLAKE2B b8a72fc09b476ff8539eb9208b7164864822b501ca4b0478a7c32d3b6add1a37641905ff15e4043c897f734033eb8b3dfe1ee981c7f7e7664ca3b9f083083081 SHA512 50e50b7d028877b07fed0d39045d20da36017e5fb57fadd1b0554896e416446c20d5a30d0fcea25fe57f13869c8647029b0ae5b12bd1917eb6150c130069b55f +DIST linux-5.4.211.tar.xz 112946912 BLAKE2B fd34cf8643768dad40e96ff12058bbfa6240d456b0f0d58a67d0e40c527b91c3571783ef0abdb2e36d6c6314cd1782e032b64cb1a5c8b7aa1d586e191df024ea SHA512 7da542bc6ae6f46c5ff235c09f2656c29465a71edf2a83f0a7ebc57c6eb14a0f7ef4bd0c25614f0b4e191f80e617517341e8b1f14bb6bdccb003beaaf888cb2d diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.211.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.211.ebuild new file mode 100644 index 000000000000..bffac7964798 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.211.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/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[@]}" +}