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 16E1615808B for ; Tue, 8 Feb 2022 23:21:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90BC2E08D3; Tue, 8 Feb 2022 23:21:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 EDE5FE08BB for ; Tue, 8 Feb 2022 23:21:46 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA898342AD0 for ; Tue, 8 Feb 2022 23:21:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 165A6287 for ; Tue, 8 Feb 2022 23:21:44 +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: <1644362487.73d4b88c060052eccab9c9fbacc33b705f137032.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.16.8.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 73d4b88c060052eccab9c9fbacc33b705f137032 X-VCS-Branch: master Date: Tue, 8 Feb 2022 23:21:44 +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: 88006c57-49ac-41f4-9df9-cb779cffee6c X-Archives-Hash: c1336f34452d95c1142e54dfdf1cbd94 commit: 73d4b88c060052eccab9c9fbacc33b705f137032 Author: Michał Górny gentoo org> AuthorDate: Tue Feb 8 19:21:23 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Feb 8 23:21:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d4b88c sys-kernel/vanilla-kernel: Bump to 5.16.8 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.16.8.ebuild | 130 +++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index caa4be862108..f5fa57b35c68 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-5.16.6.tar.sign 989 BLAKE2B 49eab210f7029b8a24cbaec467cd5b1ead4b22a00 DIST linux-5.16.6.tar.xz 127541436 BLAKE2B ad852ae600f033fbdec4d507a523dc12d0b230c9c498d5147d39c707516b6bccc15fc23bca75c6b1ca17a02647de3074b1a8d03fc62ac8081ff78c1507e7f504 SHA512 5fd0b2f0ff7d8f6f96f0b979b391baae97488385ef92cbb1d86bd49471ecc5c08e543f01b760f30df4a5b5551889b1aa3a3b801f97fef9230d65d17470f64c48 DIST linux-5.16.7.tar.sign 989 BLAKE2B 0680d8209777e1f9a9fd596409600d014f69038f8c4ace91371513e5ebca31233c88a238961f4815faa9861bc424369d7abb7488fc3881e9945aaf3e2a1d18b4 SHA512 8cc4ca11663de4a466192307c38e7d97661ed6e55a0512fa02dc74184e939bbbedf40ab014517c85d06f5ddb481d705367233cdff6baa9cdac15eda587c6e672 DIST linux-5.16.7.tar.xz 127547880 BLAKE2B 3b77442d05fe1550f608f8e715e99eba099270b409f2a0adf4acf5298b75c3bf4087f730174b3f4b3fc31214ccc62dd80d194e78d9b906e1fc8e06227f933225 SHA512 db21a01720921ebca5d462b828c661be3edcd0c6f62e20a187aff95b1f8579b119cc7d5443fac14f9372dba41764cf01b50a484eabfad33dcb6b06d2e1268a17 +DIST linux-5.16.8.tar.sign 989 BLAKE2B 61a05fbb027bbcfafb92e96cda1c94c26aa2457278fb002bf50f2b69d324adb7598157346a207c07d16da742250eb1f221b6cf4b0d1f1fc07a4daee50503adcc SHA512 e5223421c9008473be38a9f29f5361c839d006f497052a5f63783cb9737b89ee2cc644cea307913b87c5d48338c1b19bf6a49ca8b1357da1851408d5b38d42ec +DIST linux-5.16.8.tar.xz 127565840 BLAKE2B 6df3328fd48c422deb1b5bc9f3a98cc0a9d82c1d10ed87d64ca78823fa30ea5434ab85c0cde064849547b2f030189a6953a1666f82d4464f1dd690770cfe02a3 SHA512 66a0874eed7b2367fc0b69bee8c40a945b9e58d1a820c3e7e741bcb28774c811dea251826b14e2452d9e1fdd7509554ac50229f942c8ba853c308affba94a39a DIST linux-5.4.176.tar.sign 991 BLAKE2B 6eda9712c42bcd44a52f6ac603bb0d4c2698583b18de38d845a22ad0e11ef3d59f415d2bd45ca3cc2cba6a46da72b91dbf45e9d444e97bac710f3a3a9339ed9e SHA512 7482201bba56cd484a1d4b0fd8c27d5fe59202197a4e4c38324fafe79695216ad4f0e3c4cd5e0f3f9a4c5834ba0796c332cdfcefe91036d28ca4637672afe2d7 DIST linux-5.4.176.tar.xz 112880184 BLAKE2B af66cb30d3f9ff38f6e11cec51f355a4c3decec22f5227e3c0b095b09c735a239fdf1c2b3c5af557d7c642e6c25840986e115260049cf2287ef0d70fd1d35a4a SHA512 99b489523813446007f3bff117cf12a0c3f6f09c00bbeb2cb825c1ea56aef3f2f10d6f2a9454679b35a3024f8dff4e00ac8da480e35a29c7d9775b9ecda6445c DIST linux-5.4.177.tar.sign 991 BLAKE2B d285ee715f43e2fe7aee5556baec4355a479dd14020a0a1753d9f5e541e50a24714563dd5de2e535df20f608c39d1bcbaf55b422208d9280ced2772e25115a7f SHA512 e9f38cbd706aa0df45d30e3c5d8f3b79843cd29f362ceed4ed2dfc868b64285da3e679640ca50670b80b6dcfe9144903f504ccaa4f4c70f3b5e5311b29ad509e diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.8.ebuild new file mode 100644 index 000000000000..e0dfdcc60039 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.8.ebuild @@ -0,0 +1,130 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.16.5 +CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb +GENTOO_CONFIG_VER=5.15.5 + +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-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +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 + + local biendian=false + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + hppa) + return + ;; + 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-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-dist" + use hardened && myversion+="-hardened" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + if use hardened; then + merge_configs+=( "${dist_conf_path}"/hardened-base.config ) + + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) + + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) + fi + fi + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +}