From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1484497-garchives=archives.gentoo.org@lists.gentoo.org> 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 9522A15800F for <garchives@archives.gentoo.org>; Mon, 6 Feb 2023 19:04:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45EBAE0871; Mon, 6 Feb 2023 19:04:40 +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 254F2E0871 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:40 +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 E3BF7340B77 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 070968A7 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:35 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1675708867.a0190dc665e7da1ed19f6633c3e0bc08cb9a8fd4.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.167.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a0190dc665e7da1ed19f6633c3e0bc08cb9a8fd4 X-VCS-Branch: master Date: Mon, 6 Feb 2023 19:04:35 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2516f2ed-dae1-479b-a340-e726b83ebfe5 X-Archives-Hash: 27753270500840b97cec9c7843e8e5bc commit: a0190dc665e7da1ed19f6633c3e0bc08cb9a8fd4 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Feb 6 14:27:54 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Feb 6 18:41:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0190dc6 sys-kernel/vanilla-kernel: Bump to 5.10.167 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.167.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index e92746788f45..e64e48bbfd38 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-5.10.165.tar.sign 993 BLAKE2B 0c878a82b5044ea113c83c820f0dce146808968 DIST linux-5.10.165.tar.xz 120555856 BLAKE2B 455bed20bb26c7edde2d2fabfa9b21b39d447e4e74fe3ce73c26c69c760b1ab97808fc5d7e58db6028d76ed1a858438fd50e7e8a6909c7bf225e86b430789abb SHA512 2c3431a36d4be44b83f70025110ac4b4799e284481d11690f620813d5b4b48cfd1c03f0e93103339ae7d017a61c46d5b8b9b1031f3be444d491ead74a1cb0386 DIST linux-5.10.166.tar.sign 993 BLAKE2B 354afaef10f11a81aeca2e6acc132c961ef3d14685e86f8bea7d8b07e8f9cf4ba318e808cbee6363665476ff0f5969d5b17509c55fd05bd916e59f842be6f60d SHA512 357c06dc33ce7f8559fb9e525fab2d3e217d1bbcf13f6a4cd45cb9cbba376abd282ef333c3ab4c44f942f174c82962ed6e9fe3eaf7855c722cb03f3ff18282d4 DIST linux-5.10.166.tar.xz 120550760 BLAKE2B 87cd994ce1b3d4d573299aae680d4488797ddc82a3010ef1965b7890bbb7043f84e95f96e88f9988c64b4774bf64989d13cb8dd4e0882e21ea81481dd22da067 SHA512 a6c185acb7b24e38e3a8331bed97dd5e03e885b5e3d5ea7fc3c1113ec64c16567dbd3ee6daa6311634dc3bfbbfdcd280571975f636457f87ef2a1e19b226b4cb +DIST linux-5.10.167.tar.sign 993 BLAKE2B 2e67cccd194ba019038a23b75d4a8410bd8492200914d546c42ead38a1059394f3518f522117cb9d377f453d4033dcad54a0de89f9a43063c62da46c64895610 SHA512 fb3a5d01e0489eb118ce6b6cfa8fdbda74b30be872a5854c13b9be32caf383b8b014b954bd1a617cdd5b3acd435ec96c1087baf914f9ae9be41068c0ede992a0 +DIST linux-5.10.167.tar.xz 120557548 BLAKE2B 2af3b16a9be8133cec49b95b1303063c684a980532899ff7cb40e4adfed9bd5c3312bd7bb5b41394cc11689cb34d9ab6e8f89175797d8066d42cb4cf45c33a75 SHA512 e9ec7f353bd49bca747c03defd4935b905222bb66c64bf23b27d3ebdc7b9bca267ca05e0f91b215cd788c227265c5aa7e26a9f0a73989c66e65ea4d4c2c42e6f DIST linux-5.15.88.tar.sign 991 BLAKE2B 928ea938758c904971cde08ea5d390ee483eda4ad5c7ced83d606e219d823966bd6ea745c64b2c954e81d444369507d57cfa3b54e18e433d9733325007fca93e SHA512 b9f1744190bdcb220d8a17b295784aa34ca0ab7035d4fc832dab0605ce665dcc9ac356ceefdf47a2996dfd33b05b0ec8a2dcd66c785146c756cca74ad10ad0a2 DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c SHA512 2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348 DIST linux-5.15.89.tar.sign 991 BLAKE2B 79d90af0bc18768e9a09ebf159713d59e708ec23ddb99662b67ca7edec6871dec70ec624a98db404b59f0daf9bd5559e5488f8280c2e1fe83218a6e99f6bd450 SHA512 77846c9c18aedd5f8dea54208cc65067cb85a88532f812c19bf510d34e03d0f4599c4d1182d799c982ec63d235ca0af474b2817ef8d45e2e4bc51aa8092329b8 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.167.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.167.ebuild new file mode 100644 index 000000000000..9f817374f36e --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.167.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=g6 + +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[@]}" +}