From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1402784-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 12612158091 for <garchives@archives.gentoo.org>; Mon, 30 May 2022 20:38:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 596B0E0932; Mon, 30 May 2022 20:38:25 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42394E0932 for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2022 20:38:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6A9513419AB for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2022 20:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07B8448C for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2022 20:38:22 +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: <1653943089.849e8a442620686c15b3b85c64f5295c1bf7a4b3.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.119.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 849e8a442620686c15b3b85c64f5295c1bf7a4b3 X-VCS-Branch: master Date: Mon, 30 May 2022 20:38:22 +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: d9dfb7b1-a23c-4cce-befc-cc86a4fce181 X-Archives-Hash: 09faeeac44d7a11d1dbacb50caf3fb9e commit: 849e8a442620686c15b3b85c64f5295c1bf7a4b3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon May 30 15:46:40 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon May 30 20:38:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849e8a44 sys-kernel/vanilla-kernel: Bump to 5.10.119 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.119.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 06ff1195ff05..934922ec4f30 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -19,6 +19,8 @@ DIST linux-5.10.117.tar.sign 993 BLAKE2B a4365bbb057db936510aa6f1e50b136a4e35c60 DIST linux-5.10.117.tar.xz 120409348 BLAKE2B 8258d709d637891dcbb8523c6d9c8c007a44b7f7a109ffa9cd48f9fd9b4e7dfba170f9ed97828f4beabe6c6ed34ac69b287ee489321569adb282c7d0745d3750 SHA512 3f9488c55a6e9458cf53e06992ff56054cd4c933eb0e87a5122b6b7367d6ca7aa3587572e8f5362cd3264104f839102f87f40ac98476f666c44488b9422fc39f DIST linux-5.10.118.tar.sign 993 BLAKE2B d449666a55dc6befeaeac7a851c88eb04c6abe131e9a1b8bb015c41ff2ed5612c9890bd3c11bb1a1439fd726c454ea669a5b96c8f8936dfed2a84fda997b5334 SHA512 88d7f89d4b289f79f073a9f807f10dc08ad256a6df48952dc7f80c38aa455c9918050acaaf8c4619f973e7a02a9d6848ff93ebc2a8283a1b10381dbb88df27e3 DIST linux-5.10.118.tar.xz 120395788 BLAKE2B 19550892ca372803456947a8b1a6f774c04c6383262273855235d40fa1005df6ccd93638abe9e9f0b52fd0692863f07fd18901a7cf113b16af80a2030b2e9ce4 SHA512 5ce0746c3b519abe9e20d1c80264a6a8e49bc18907cc0712fd0520f8e74806028a1b3929da636d6ab88b195895f1873122122b1506b7047c37ba30ed22b357f1 +DIST linux-5.10.119.tar.sign 993 BLAKE2B accdf3bcefbde0f75a8647910dfd71ff2656c1366c37716690b23b6d0f72d2898211ca5908e78a28bbedb6e0035cfab90a2ad321bc43a26a2c22fd9cf6338c2d SHA512 14cd205d86b7670c9c64a4615b2a7e99c55359374474032efa42f1e2f7aaca81437a3dafb5405047d42057964e0a924af5565767705e2eda79620a512d801315 +DIST linux-5.10.119.tar.xz 120405928 BLAKE2B a21d2ecf3d779d80a83d4788e8043811967aa6456e072f25833a94769326b1ee818e3042691b3a6581d5ed1cf3afa2180ba4252ec78eb6cb5a64efa4023c0ce8 SHA512 6a067963e9fdac0289a70e2d713e65376be4058063c332ffadb5daf33134bc0342dd9d2864118820af2d06b27b75148d9c624d5039b36c2bfdcc96aa37934580 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild new file mode 100644 index 000000000000..96cb3e86fc4b --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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=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/mgorny/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[@]}" +}