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 E73AF15838C for ; Fri, 26 Jan 2024 14:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22AC7E2A08; Fri, 26 Jan 2024 14:14:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00F9BE2A08 for ; Fri, 26 Jan 2024 14:14: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A2E63432AB for ; Fri, 26 Jan 2024 14:14:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B7151133 for ; Fri, 26 Jan 2024 14:14:38 +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: <1706278459.486f906d27660bc514dd22f7493b079582beb2bd.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.209.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 486f906d27660bc514dd22f7493b079582beb2bd X-VCS-Branch: master Date: Fri, 26 Jan 2024 14:14:38 +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: a6aa1717-7569-4b02-b9d1-87e4fdfb6b06 X-Archives-Hash: 4e8be6c4eee1f24cfb53c4133d015899 commit: 486f906d27660bc514dd22f7493b079582beb2bd Author: Michał Górny gentoo org> AuthorDate: Fri Jan 26 10:09:24 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jan 26 14:14:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486f906d sys-kernel/vanilla-kernel: Bump to 5.10.209 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.209.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index b183ee820c7c..38bca7255d8e 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -22,6 +22,8 @@ DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa DIST kernel-x86_64-fedora.config.6.7.0-gentoo 245518 BLAKE2B 95e474477509bae45c63e8fc2ace4fbdf13248bbd5b47728882f25b52923c95f1b26f096769c4c4d717de8af1e6ebc3c7ff6ce8a84f4a3301153d6f9c47a1086 SHA512 b7a23d49904cf9230beeff69456762be24b145cfe2b3cdfc414826b2c7ba6454c60d00ff3269b81fe0eb0c6e40dbe2cd301bdeba1bb43f82fcf2724c77fd3b5f DIST linux-5.10.208.tar.sign 993 BLAKE2B 4939bc5189973fc1b7aa6e09789199584c7bb217597e7ec7746d8bd33fbb23d613c8c10e8d2c2c400fb7d8f0f55e6dd5a29242ca663c06e4433f8232efae9833 SHA512 dd9df045cf6134dce978eebca310a171b0c5a8fd2845c49d968b872d28e01e5f1ace01b7203d56576e9ff30da95ad856ad0206cb649a3dc83b3dc58f1213e7b2 DIST linux-5.10.208.tar.xz 120632496 BLAKE2B 4eac6c86f1978a333d99e16534f529d1f59bad0d8843db7eb72c550036ca4a8a89f128d2f49e584428b34ea6452e16d7525d6d23cbc8f520baaac02a9ea08636 SHA512 f8b12727c5992d652b42935ec95fae8a7565102d635279110f466b60a00f3b140ff18fc41f3f87879553664b6dad162e2c17d5c7ca41867d63b27d9182fec56b +DIST linux-5.10.209.tar.sign 993 BLAKE2B e1f53144ef2022b2b15cd5662cca69c83347e7f8167ad10a7b5c1fd161a47526c0b014321617794ba63a9ed9d167ae801e55f3f6caef767bfb1a11329336e463 SHA512 5c442c737d1f920ca3cc66cf2369fcffa06db9f677d2026acedf4c62e1e7da745bd3ee56bfd8d262bf433321f519e27f3cfca73bf23a148289fa4becb02f030c +DIST linux-5.10.209.tar.xz 120627600 BLAKE2B fe5b84a852bf013f563259fdb3288ef53e7f5f4a154446414cfe59ba1b2b6d7e95c0ff4130e5fd8780864556399bb03cf744e655d0bda36989da64796381f6b8 SHA512 85f0957d052c8321e5b4fa2aea19220f0ef581e25d760746315afe70878353b9d4597dd2aaa1fb41ef2631c649275cd19fbb92b8ae9ccc8f86c6e17ac171b1c2 DIST linux-5.15.147.tar.sign 993 BLAKE2B 8ce7e241fb18e88805a947ccd20414b073e90ea6a4b0c09683a3a5f56d8542ab262b26842bd3b3a678937b4fa01fddffb8910c0db7c9015bafa8c8b8b707feec SHA512 0390a4084b356108f50750e43bea4c1924ec042d149a4bb3e5ef63c621a0913ea3c3dc6d7275b1a78072c5804a6bd03d103d342f38b817a120637303b9b4a586 DIST linux-5.15.147.tar.xz 126590916 BLAKE2B 9393691267076e27e5b46f7e734e67d42839380c5d3054dadf1d2a9178f3061d710cab1ec14f2c6641ee44cd83a0df8881a1d10ccee4e1e7bdf9bd182a3b6c49 SHA512 6942be1260060544d27bfceff143d85b9cccc801b5f97c82ac75527fe9e0bec245e17bfde932f6886a1b0c76b1140af558e6467ba9b750ea3bff651a27386340 DIST linux-6.1.74.tar.sign 989 BLAKE2B 32f15848046ec1e61b4f34a9f54fdeacf5f7e2ff7201bcccc9aaabf50ae6b953fe6acd725745a44bb1898bc982b82c4ce1a926ce59fea0c8696dc3ea30008ae6 SHA512 f1a11fdff28c068ab4b9d0e7b5b79f4b644e78f8454fd4e50d868a0ae52351d3549ae80e22ff04158900b13ef5afe34cb7eb3deb7488bcb215393270828f0a5a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.209.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.209.ebuild new file mode 100644 index 000000000000..9c5b591d7e2d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.209.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=g11 + +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[@]}" +}