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 41FEF15806E for ; Mon, 5 Jun 2023 18:35:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3248E08C8; Mon, 5 Jun 2023 18:35:18 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1A36E08C8 for ; Mon, 5 Jun 2023 18:35:18 +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 30D3033BDF0 for ; Mon, 5 Jun 2023 18:35:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E9C6A91 for ; Mon, 5 Jun 2023 18:35:14 +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: <1685990101.a94c130ebbe106c247b67c9c726ab1acfb1422c5.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.182.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a94c130ebbe106c247b67c9c726ab1acfb1422c5 X-VCS-Branch: master Date: Mon, 5 Jun 2023 18:35:14 +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: 3c4b19e9-1ce2-4dc6-9f9e-a7aa39e9ba28 X-Archives-Hash: c5c486bac1d7ffeb4928561d49f52085 commit: a94c130ebbe106c247b67c9c726ab1acfb1422c5 Author: Michał Górny gentoo org> AuthorDate: Mon Jun 5 14:31:34 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jun 5 18:35:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94c130e sys-kernel/vanilla-kernel: Bump to 5.10.182 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.182.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 268c62478702..b1b363f76d1e 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST kernel-x86_64-fedora.config.6.3.1-gentoo 232020 BLAKE2B 58ae6268d9571b7384b DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f 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.10.182.tar.sign 993 BLAKE2B a7da63cc127e64cbe5dbe82c08113a8ca451850a503b4f13ca80b42997620f73c3ba7a9e83c12c9852de26f7333f56a1b0d92df193e9549b6e2f959decf6d3e9 SHA512 a6833d1f94e25f33757ba79d81b26538ee91778e93474a8a795b471d04842e168ff75b2cfa85383d3a05e2d2a28b9dd2d06ca40156921b56ed38081c7b250b7d +DIST linux-5.10.182.tar.xz 120611812 BLAKE2B a567ce8289e3c7423bc1c045041793f910b042952635a74643d515eae387058a2b9c32932fb9d98bbd4a495aeb4d14fa5cae8d423a8a3f19c193260bdd08d31f SHA512 99958248f63efbbe9f8f2c4d9fc6bb70e8d0bbb5945ef46b0c77b844ac544c1f847d7ee5c99682c55770fff677e229bdb609eb07962c9e3caa9e5c509aab129c DIST linux-5.15.114.tar.sign 993 BLAKE2B aa910499d419072a092b7183cda7ac15a34d128a0b84aabd7e2ec3ce692819c1bb403973167f8640a1abd53f091cb9808c108a246849d08d59d32a650646dc3b SHA512 d5365a0738d6b950506787e1a321deefe9c728d34678cf88d984ea324950f92e0fcb6cea64e87f284a549edac36b8c0a1eccf6321334c4ef430102ff9c748f52 DIST linux-5.15.114.tar.xz 126540708 BLAKE2B bc4a7b2f928219186e81d04d1eaa46f0976decd53112c4f01a4c698fbf7897686e02ad09ff8695e3337934824c254ddfed6ec76c66c30ec6495f4aab7fce8cd1 SHA512 2fd0a4143592f989663301f5f5d34df0ce6cca66c0c262abe2926e942739b3bb4b7a4faee0e446f6e3ef52fbf2a756cabd8cc8b18a3243c269349a1e6399218a DIST linux-5.15.115.tar.sign 993 BLAKE2B 668a30bb360c98839e15cc1f5fb4d0edf93fb819d7f36587cb651dff7389a642af4eb8cb148617fb666d9594891c7f0620088c0e7b4d211b91b61b16892a8e77 SHA512 b65deba6871540e7a04210c4342e28d65c754daae52f3e7944ada55c8dc32bfe2909e222f5a8ad5c3518cd13096186421590e5b5e4318742ed1407815eed94c3 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.182.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.182.ebuild new file mode 100644 index 000000000000..3d406f474e2f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.182.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[@]}" +}