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 7AB6C159C96 for ; Sat, 27 Jul 2024 12:07:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B75672BC099; Sat, 27 Jul 2024 12:07:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 9365D2BC099 for ; Sat, 27 Jul 2024 12:07:51 +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 A8D9233E3A9 for ; Sat, 27 Jul 2024 12:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44C9C1D88 for ; Sat, 27 Jul 2024 12:07:49 +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: <1722082061.53aa67f979beb5426534459d9ffcc193a353a67f.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.223.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 53aa67f979beb5426534459d9ffcc193a353a67f X-VCS-Branch: master Date: Sat, 27 Jul 2024 12:07:49 +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: 255cf752-0e02-4572-87cf-50c2bdc92a66 X-Archives-Hash: a7254abe8f425bcd892ebc1f7f661386 commit: 53aa67f979beb5426534459d9ffcc193a353a67f Author: Michał Górny gentoo org> AuthorDate: Sat Jul 27 10:33:21 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 27 12:07:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53aa67f9 sys-kernel/vanilla-kernel: Bump to 5.10.223 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.223.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index b2f8a55b1b66..155b59dbeed6 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -30,6 +30,8 @@ DIST linux-5.10.221.tar.sign 993 BLAKE2B 85d9196bffd6aec1cda34361a4d973c99949905 DIST linux-5.10.221.tar.xz 120696852 BLAKE2B 4dacaacc8c3b5d326ccf3b8689941d525903e6df6cb8ca3f492815a12b27641ac30c2d749bdea9ea13ac9d3e78e69bd05f0b5f7eb989d3556a10c0838144c8df SHA512 55209b60c76a88f0f0b57f19936be7d424cdccd5e03f71d2d6c7ce9794f571ca6c7433edf158bd3b300556ff8615e8a7b651505040dc9b8f14733be2778e8c4f DIST linux-5.10.222.tar.sign 993 BLAKE2B ec9a556b9aeb2cf51d14f5459576f92ca3bb79ec176fabc9372800bbddf3e4d614b662cd3f1fda6356e39eef4a8d49ba554aaf3e4d184dbe94b42f80fe8077e3 SHA512 042d03226a57d7f6111378e07883eabddb4f0512c7037ee48d9db3da8bf63a28e742663d8a045eedfbd3cb267bbbf42e76e3740ac167ab3b534d2407cdd7c9b0 DIST linux-5.10.222.tar.xz 120709324 BLAKE2B 05370e0a32687a804663ce4da2e3ddf03a4c7202842550a5833ce50a7eaa434094a981d83a04dd893a925446c6f1392af6d26253511c288229d891c610f721ce SHA512 384b3b816daea1579116f86e0e0271101093ed82854a986351b1a5936f003ed1c469856c26410ab503480531acfe9ba1fbc39dffea03d32ee58849ad20af8877 +DIST linux-5.10.223.tar.sign 993 BLAKE2B 12cb50217d95ed49a9b96ac804ec48f273d601999676887dff575ae33601d4e5bfc6cd41569018ea3760822769753fe63ca750919f5545f112de466d7a5aed9e SHA512 9ea089f6018b273777293d33854309db168e98b1abce0d0e23db6d8bfff8b3a8fcc57514d632df910ed9554e92e6388f0f089c9401e67fa570358d25a0f5bfc4 +DIST linux-5.10.223.tar.xz 120710080 BLAKE2B 220c17707834358323aefaeb0de62aecdc8679b453d25e8e747fe3523c9055cd239002e03ea13f4241dae2db3da248f3f2e72ebf550dabd7d108d936c5d21ca1 SHA512 e764f12d1736261cff4c5a73264527d9341dce6268a0be236cb3fb5cf0521487844c341b0c34d6aeb05b4556726f53074cb1d2e2e34ed1df85b51831ebe7e96b DIST linux-5.15.161.tar.sign 993 BLAKE2B e6464f00b905ab861421e87a96dfb2e54d433e924401cd022dfc8a7801767c1cd247a59a9beea84664b6895e49c8629f58080902fcf1728706ef57bc3e954adc SHA512 fdaaf0f6d49c4ba04920723c0352fe067d31b6abfd9625999b0977b23e73c03ad4abb3fbef818128c7183a45a9e001d75d2b127f90de65a4249bf73b0ff403fe DIST linux-5.15.161.tar.xz 126661488 BLAKE2B 4f7787ad6b08c3248df0b665b494c52966f93f5131455cd8f90b86c16b5f9ac30653778ec7e1003887700961ab1e6082347ef272570147f7629845b10080e72f SHA512 64ff65b0b15ee2f51609129ca92132c25618e76cbca204d5cb19d0239f58e6470aac782448466e8b0d776c0e4ac85a2342e6b053fbe2982b8e99100784ceaf5b DIST linux-5.15.162.tar.sign 993 BLAKE2B 45a891b3b1dd9d671cfd0f089c79bbad0b89525a3f20bed1db4056a4713967833018d0b0e721b3053bf08ed09b40722613f1aac33be7784b5aa1b5a79bdc77d8 SHA512 0c5c7ff16d78619c884bc6a02866ec8837d99bc35f806e9006814856bafd1edf1c460bd48d9a1f04e1a486ea01f3859a704b0ec69984d535e8759f4deef73caf diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.223.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.223.ebuild new file mode 100644 index 000000000000..900f0cd17578 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.223.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 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=g13 + +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=/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[@]}" +}