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 1BBB315800F for ; Sat, 14 Jan 2023 17:25:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67F3FE086A; Sat, 14 Jan 2023 17:25:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 50934E086A for ; Sat, 14 Jan 2023 17:25:37 +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 72B3333BE2F for ; Sat, 14 Jan 2023 17:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80289858 for ; Sat, 14 Jan 2023 17:25:32 +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: <1673717118.2e97a238a88ac2afbcf5fc5220d490131870e531.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.163.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2e97a238a88ac2afbcf5fc5220d490131870e531 X-VCS-Branch: master Date: Sat, 14 Jan 2023 17:25:32 +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: 2c10fe48-f785-42b0-9ccc-20743d880624 X-Archives-Hash: 955dd0017ba9ed2677690ae702242636 commit: 2e97a238a88ac2afbcf5fc5220d490131870e531 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 14 14:28:58 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jan 14 17:25:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e97a238 sys-kernel/vanilla-kernel: Bump to 5.10.163 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.163.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index d6a3c98aaa2e..46763277a7f7 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-5.10.161.tar.sign 993 BLAKE2B 9237c5037a39e92c2eca9b2c16de865ca5ad115 DIST linux-5.10.161.tar.xz 120516432 BLAKE2B b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb SHA512 aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5 DIST linux-5.10.162.tar.sign 993 BLAKE2B dbf8a63c4035e3085b59d13c5e0763d0e3884798a59c69c627d00a15813db8bf4fc84b4952a68d0c2230d3e5bfacf6407f8915c13bf5bdb69c98a8ed1d93f27d SHA512 329319be28334b3ad351394e6f3e6e6f93530511ec52b53012d8abee2bc1d9e7f043f277d9b3a9c9b4bd0abce69c05167b45cb58b6dfb6ee96367fbb5eec7a67 DIST linux-5.10.162.tar.xz 120528796 BLAKE2B c06f95f9232cae822f390e7d443eae46fc5e4b5625397f0de64d8ed3a6fae68fcebdb855b0aa6e55829d920f94f3b602e165634b59da637ef92a804f6317bfb6 SHA512 941c7ddd7c27f49b4491e1c8fbf1efedcbac50b48ed8836ec91091ead69723f820a61bfda795378dcc728a782d2206189903333e83e255b723eec01157bbb0bb +DIST linux-5.10.163.tar.sign 993 BLAKE2B e085bd8633c659a431f1d6cf070761238e2cd52b63421be67870009afbb90316cdf5ad6c58cce17614cb0a06f067f5daf22d864aa00bd9940b59deba0b31a294 SHA512 6e6d962157828fddbae6c98d00c27d22efb3a2cfbb45d3dccc86ca1a73e6d70f80e5a58f92469e18a5448237e40b77c995623deff88fc328ff333d48fa91dbac +DIST linux-5.10.163.tar.xz 120553276 BLAKE2B a9806d2fcc28783976a78d5f1fb4d10f1523f0fce35c5bb04485cf54db843b505350be3dbd31bba2b528289bfc97cd2719b54756512409fd03a158f37cc1940b SHA512 8c405ccc8e0ab1748058d7e135ccde5501500d535fb8c2023c4c6a399be8957e5d6f9398ff30769078bc8699509db333f158f79fb8a6e7b816aa1ec413ba8ea1 DIST linux-5.15.85.tar.sign 991 BLAKE2B dc06c346781a947993743eeb08784d35091b64c2f6d617f05e6b8eb6143887362d34a8f5e819be24cb423ee0d4e92dc040246d6f979d9ddecbf79fea439b0bf7 SHA512 c2d734b5bf0f4b5b568d5c9217bddbff319c727d3489afb8eba64f67b225d34ce8de079e2e8c4210c4096097c28cac255c9187b0267dac9b842806ce71a47220 DIST linux-5.15.85.tar.xz 126501228 BLAKE2B 481cea334dee4146d72704ecb88f654bd38ca62a5a28540f365a57f5cd522551c4b7f854c09380ec614098a9efa5dff4cef70c9cafe6277a410d3d2099eca1cc SHA512 8cc19124c82f14e09b5ff8d2e343cd41cdfced74e5c0c501abd258555d9dbaa79e79cb23256a474cd59311ae8626b0457c2117263bd64a206151c09b54f3ff46 DIST linux-5.15.86.tar.sign 991 BLAKE2B 18dd86da143bb3e3afa28e9de2778ed384d44988857968ff6e7eca13029cfdcdddc9f707d7df1f37751b321be216b94b91fbab985ad09d2f487698f83e1f4107 SHA512 e3f6e14db0edbc41d3d9cd4e2c296eb8cf7e678daf71567aa7a814bf9541f610a1f91996b93104e7d9c35d1b079b9f9b1e14be2e30b5fbaaf587c5ef69555911 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild new file mode 100644 index 000000000000..ea9242645ebf --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild @@ -0,0 +1,134 @@ +# 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=g5 + +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[@]}" +}