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 CB114158088 for ; Wed, 29 Dec 2021 18:57:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F28382BC034; Wed, 29 Dec 2021 18:57:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 AA33B2BC034 for ; Wed, 29 Dec 2021 18:57:03 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80549342C01 for ; Wed, 29 Dec 2021 18:57:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BD22272 for ; Wed, 29 Dec 2021 18:56:59 +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: <1640804212.495a8f17fc7e7001e8006a2abaeb3cfb9da327c7.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.169.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 495a8f17fc7e7001e8006a2abaeb3cfb9da327c7 X-VCS-Branch: master Date: Wed, 29 Dec 2021 18:56:59 +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: 54eda82c-91b8-47a2-a339-f4e7f6c559ba X-Archives-Hash: b6c1ef8afcc60451c8c2dab9e833d419 commit: 495a8f17fc7e7001e8006a2abaeb3cfb9da327c7 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 29 14:29:45 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 29 18:56:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495a8f17 sys-kernel/vanilla-kernel: Bump to 5.4.169 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.169.ebuild | 107 +++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 5723baaada1c..f9b3103c4ae2 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -29,3 +29,5 @@ DIST linux-5.15.12.tar.sign 991 BLAKE2B 2eabe426cd804a5515a2fb2d65c763322d313ba8 DIST linux-5.15.12.tar.xz 121949156 BLAKE2B 6e201ffe5832a998b9bc8f63e9fcbf7f0384d4e4abb1a68c2299b8362b51ddcfbc35639bfc836a84202bec3705f5bca1616396c16daa05d778659d286f63b6a8 SHA512 8b79f30c26a865578d771b0c1a8273ecbf19135e4844210cb31c81784311601b8f7adfe1b3a9bc75c6bed99dcad9a5ff5e1976494b64f0de45be3a6570336890 DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b59dd495e78a7ba168dff85f7af3a3b7719419b767fe0b8380a904248d624bd1e17712327d2ebd62335943f8dd SHA512 bdd0a88b6199d57b3c86521e58a356a35273007fb421e5d3b80d40e4b9337c30fa1b982dba61673fda0ddc9e3107b8da5cbe4916364fbbe035ab5026befe1c74 DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510 +DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda SHA512 0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45 +DIST linux-5.4.169.tar.xz 109192960 BLAKE2B 136c792f554832e6e52340ce935bf2f1b2b09c8bb8fab6889920b68bf27134e2d53f0228ec8ac31233a4b2a5b7faed87238d1c7d509ddd8c649ab8275a860e23 SHA512 43ba0a51c12e4366e0793217ce66dfefc13b83f0ab8a575a21058909e03f161410bff2aae272c64c5873779886d24d3fd0cc82655de5b20b428eca6cf681685e diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild new file mode 100644 index 000000000000..28ef1d255fa0 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild @@ -0,0 +1,107 @@ +# 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 ~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[@]}" +}