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 CCFCB15806E for ; Tue, 30 May 2023 15:14:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8B83E09F1; Tue, 30 May 2023 15:14:21 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D085DE09F0 for ; Tue, 30 May 2023 15:14:21 +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 0A649341032 for ; Tue, 30 May 2023 15:14:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EEEDA7F for ; Tue, 30 May 2023 15:14:19 +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: <1685459650.1b7832e5663bd96bc87c05f6fdce7291f88cf08b.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.10.181.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1b7832e5663bd96bc87c05f6fdce7291f88cf08b X-VCS-Branch: master Date: Tue, 30 May 2023 15:14:19 +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: 8b6d4620-a04f-47a4-af08-dcd82f4a8ec6 X-Archives-Hash: f3782a493b1b9025510e01a0b64b0c93 commit: 1b7832e5663bd96bc87c05f6fdce7291f88cf08b Author: Michał Górny gentoo org> AuthorDate: Tue May 30 14:13:16 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue May 30 15:14:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7832e5 sys-kernel/vanilla-kernel: Bump to 5.10.181 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.181.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 88862e039f0a..fbd20a5fc9fc 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -33,6 +33,8 @@ DIST linux-5.10.179.tar.sign 993 BLAKE2B 1ae0cab95a1030f9491b03565dd215efbbc399a DIST linux-5.10.179.tar.xz 120596620 BLAKE2B 556ae6eb4a4490f9c75fa4c1e062af48040c816f4bb0d6eec404f0ae5527270c8745815e6a6cfed2a6bfb43fd65e2bfb38b922f118c2e64721cf5add0c1893ab SHA512 cded7d5f6e116ab2e0caa211a3c075a9ff659495aa320f03a72a5f037baaadecd92ff1a9a8faa337f36a84128a95e24d851da844f2204877af9ed3c9602a1f46 DIST linux-5.10.180.tar.sign 993 BLAKE2B d96ede6a20d344f8343cfc375df33c2e04ed2ed1c04f789399afcc55590d921dc72bc0539240537465992403a62df52ecbcbe8fa23da34f1e0929e276202b7a4 SHA512 39ba9d9beee87e3b91ad497dce2a4aaf41181a9fc5ab39a2893f88f54f13c4ed4cdcb325e0ec294b55c009a930414c56a49d636294008d1f99a32ba5a26c543c DIST linux-5.10.180.tar.xz 120595456 BLAKE2B 78fb5aa8b9a303900fead4d8d157bb88b733721f1d3429a2ac44e378a9ba63437fbd23402066e09aa483c6acae1513c78e61575005c337b3c73b6a8261795bd9 SHA512 5f095270cbfad418f9dbf8d1a1a38062b7ac44958acbc5c8d028eb094a8b3210d8a4f23107dd9c0d3266e813ed8d08d704704ed0fd53a6339c493a59b1ebbb10 +DIST linux-5.10.181.tar.sign 993 BLAKE2B 898b6e10b8f7ea288a847b28032b8d9ec13575b2dfa910d40f1cf893bc70942052c8dd7d3e61f10a9a97528247f52ca189ef16da3f2980842d6e51cc26c9f949 SHA512 15514b3c2a46a5b953b3b1f104a30346af36118e153e5fb4837ad4f14453f70feb09365c369943231c386608c0804591ae07e839b62a49c0962fc9274c30408e +DIST linux-5.10.181.tar.xz 120619300 BLAKE2B de4963daa6c61ad9fcc11bd620eb39c2073ad13a3a2f96a562d0c94024c4d9ba652682e2744d3b8ec81bf4058037b34fd28d1b7238d56de951c069fdefdae666 SHA512 3362cb8b4b0bd488fec412ce1c96ade22b22cb66fe011fabd0af816276bb13157336dcbaa1551e22d0af14288db1a4b3f9350c1fcdcb7fa638b66904d702ea5d DIST linux-5.15.111.tar.sign 993 BLAKE2B e2514bc633ce65d36b8d6b4c9f2e826f0d50284afe1af005c4aaf58786fc5ad5ec8eadfcfd67dd8bcf1a4026417f49d40706d80eeb084c1fb6cde8cabc5b349f SHA512 d6c1cd637540454f5e25312e2418a67f277c1b32dbd34e69728e42d0993cc4d89fc4d9456584100892df2e57f4283d1436e921bbf412d3df81d901142b3d8c09 DIST linux-5.15.111.tar.xz 126541212 BLAKE2B 329650e5b90275105806b7d6810301775cde7e667afd52fcf0c82357a1bc055a07f651e0f41b9d4f992d239b61c0157cbb6a62e1207c8efdda3d0a7db9c29801 SHA512 b56e6f9fb6f968197d5bd593c4c68c000e2197dbeab748902775e481b075c5e0a54af0f72ec67cd53dbc8ea4c673efc9599c80bd878b0afabf43682532c44fa8 DIST linux-5.15.112.tar.sign 993 BLAKE2B a4cde229d2e9ca63cc9a6295866d3ba21b1755751b836b190c9583f2273e7dfecd17f5523fb38dddc12c9e27729c2b3dde2b59e9c7831d64f90c6b4f975239db SHA512 4d48b108a3d6c957c690499ddac8010146fe0fc99768d7310605a817aecd7107f7228e9cf9937ebea30f4ae1ffaf62f5e4bbe0e2620e217541d1b285dbb09012 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.ebuild new file mode 100644 index 000000000000..3d406f474e2f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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-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 ~hppa ~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[@]}" +}