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 69D49158094 for ; Thu, 15 Sep 2022 14:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 152A8E0990; Thu, 15 Sep 2022 14:57:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 F361AE0990 for ; Thu, 15 Sep 2022 14:57:00 +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 1B295335CA6 for ; Thu, 15 Sep 2022 14:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4050C5DD for ; Thu, 15 Sep 2022 14:56:56 +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: <1663253805.f4aaca1684768269795464542053e9b0c5a9b0a9.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.15.68.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f4aaca1684768269795464542053e9b0c5a9b0a9 X-VCS-Branch: master Date: Thu, 15 Sep 2022 14:56:56 +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: b3be60d1-201f-4d8a-aa46-31cc22fb3f55 X-Archives-Hash: 4a6b2faedd9a25398d69f5a6186c5d3f commit: f4aaca1684768269795464542053e9b0c5a9b0a9 Author: Michał Górny gentoo org> AuthorDate: Thu Sep 15 11:01:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 15 14:56:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4aaca16 sys-kernel/vanilla-kernel: Bump to 5.15.68 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.68.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index fc173c1a248d..fb1c97407506 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,6 +38,8 @@ DIST linux-5.15.65.tar.sign 991 BLAKE2B 23b3a75c1f23f76d57f9072ab0b0269c31628ac5 DIST linux-5.15.65.tar.xz 126447020 BLAKE2B a5205f703e3c2722c3712c14317624e576faecebea10e8f75ef681aa53bc2138058cef4a18b92c758562b7fcb5545f3e78f9c8091e18f0bd55c791baedbe1699 SHA512 39a782a76ab4a840373bae2d7f4ef0cf1a63d60e3cd78b8515184da639badb34642abdb27677ffac0344efe187a161d2ae87ac11d78f401074c21945e0c8bbee DIST linux-5.15.67.tar.sign 991 BLAKE2B 1f43794613a5bbea31425468dda1f9b945b40086c2e6734b1f0c4ae292be36ae17c78a82fe280b9475c9194d2e5f4b0b443ea85158187c8015ff280610913fd8 SHA512 34c2465a934497f9aec86b132bed931e8af9dd2e2234e09972b010e852448bb41d9c73968e5d6cdb25ce091be089289db6f369f177e7f84146588459f35dc5b1 DIST linux-5.15.67.tar.xz 126428464 BLAKE2B e263771dbabe2ce34bd10ff95adf9442041a2b1b2125360187b27cab34ae093c8a4a720e0c371f25a4dceef881c73c9428f38c56b5daed8cce7dcfddc93f5c36 SHA512 e4a113f11b8fcac3512f5f9a42dfdd30774c8979e4a7877161a0540cfbdbba88cac54cfe081d2f13d60f48b4fe04ea6ea79d6513376f036a67a4f93d45846895 +DIST linux-5.15.68.tar.sign 991 BLAKE2B 04b977efcfbf7af3440ab18308a3ff849f4294b5d4d12695be08cc60cfdd4fe9f48fbd4d1218bbdb2ced9d539bf15b9f9050c92f258669967aad733d67a69c3a SHA512 c4928e896e59ce19d63ffe395b77f85507b329592e79b2d6f285cd48e7a57726d3234e529f29dcbf277acc7864aa63ea604a2fab08c7c3e74c1f0d3c046f196f +DIST linux-5.15.68.tar.xz 126445616 BLAKE2B b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1 SHA512 fa62e3061a84c7fe79eb69e7c4fd4bf77aebb11ace53fe2bc5a63629a99115d9c406992166ae84526d8854af57cd9cfd173191877ea6639a5fc3c2a60ab22931 DIST linux-5.19.6.tar.sign 989 BLAKE2B af1848224de41fea363df3d6ef1a3d923d242c232e384f960cd813df1f733f4f59bebf61d932455f3742c8278170ba2ed7eb2fd3600cb9636082bb50f8408020 SHA512 29f22d3d55718a8aecac6bf7caf889f20e01cbcddb5d3c2047ae701d90505db045d6414857d61caef8e6a31cd8ce9bd5016e18405c6eefacbeefeeecc7ca22dd DIST linux-5.19.6.tar.xz 131649076 BLAKE2B dd6fba4d56d26923310426589b28c83f699a62b676a76257e0ac49bc85d30ffb24f7a66a20108dfc5bdaa1454fb0ece3f28c483b246d3778cff220de527ec4aa SHA512 b39707864c7cdc4290fc6f4ea545da1b6029eeea54d2bec88affdac9b0187e28ebbf99badbb974d5cf4ad854fbbecb98d7385d5bb6efc74e52a7d8dca146e82b DIST linux-5.19.7.tar.sign 989 BLAKE2B 0b410b41cc1e41d4e2aa4bc89200636bc577231015684e3409f6dae19c33873aa69c3bb29019f6a968f7ae71dd7265ee9285f8351b8acf1547e627d11201a824 SHA512 bcd13903a4d5d12db6f46f6ca9a219f3dd72388a582b06a0133422f5f95ff6ab582c39730ce3041c0ceacccd3e49a4aa67e552a1087e667c4db90e65a0a96de3 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.68.ebuild new file mode 100644 index 000000000000..e9d460c7094d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.68.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 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.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +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/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[@]}" +}