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 76926158086 for ; Wed, 29 Dec 2021 18:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 447112BC008; Wed, 29 Dec 2021 18:57:02 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FEA12BC008 for ; Wed, 29 Dec 2021 18:57:02 +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 1B489342C01 for ; Wed, 29 Dec 2021 18:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54A7526A for ; Wed, 29 Dec 2021 18:56:59 +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: <1640804210.633d8e062cead962138627e5e26126125157ff09.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.89.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 633d8e062cead962138627e5e26126125157ff09 X-VCS-Branch: master Date: Wed, 29 Dec 2021 18:56:59 +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: 6dd9ea77-1bcf-41aa-af95-6e914aeb1968 X-Archives-Hash: 6c54c574dcde086e6019cf5bb1496d1e commit: 633d8e062cead962138627e5e26126125157ff09 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 29 14:28:34 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 29 18:56:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633d8e06 sys-kernel/vanilla-kernel: Bump to 5.10.89 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.89.ebuild | 130 +++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 2335300a033b..5723baaada1c 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -19,6 +19,8 @@ DIST kernel-x86_64-fedora.config.5.15.10 223671 BLAKE2B f45dcf49155b383c2b04ebcf DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f DIST linux-5.10.88.tar.sign 991 BLAKE2B 8ba7edd3b3d0b96c5b9ab70d4290952c41327edd7e7cf707b84eca94714a1cf05577d8b6d8d7d419986ae384a268f36157edefe6b950a08aad08fc37d061102b SHA512 2c609b8baddd47db61091b9284a4786b1a22fb2848ec2d51a2b7b73232148a0e948ed35fcb39a7bff646f90ab6be28d81e12bd8358cd3161a88beeea8762d306 DIST linux-5.10.88.tar.xz 116476744 BLAKE2B 89a496f0ec427061c04a5568bdfdf04ad4ca55b3c81853ae9f64d53608efd39d55d8f2074f7dbeb9424f6b9cf9b5d9674b98a05d24414dc0ccb076a9f9d27685 SHA512 b4400a65dee1e5e7bafff69012078e81467e9a7aeba0eaaa84137e7056b5b79893eb62ef4309a340b23770d3785a7d236e837e6f39f24e58db00a8b4d9190a4f +DIST linux-5.10.89.tar.sign 991 BLAKE2B ffd758cf40031ee8ada07514218d9c03cbdbf21eeb5c37d711150fdd391bdaaff7808d5690433ded38229b2ae504532002a9a7aaffad588b187b9a5e4c9ae7b6 SHA512 0c1bac99bd1920250826f7d14194084cbd179b42fdb62c9ba371a62ecf309b9152aac4e2f1fd3d982e136887d9d98e302b3288e2d22fe124c3009955b6c9186e +DIST linux-5.10.89.tar.xz 116486456 BLAKE2B d91cf085ec273b3ad3d128e4097d0841496c0e71fa330a09b2db878cc4a7c683f8444e7611f172ffee84fd2180a2037bdf57fdf4fc1e6995d3b044eb4ac1785c SHA512 a5c60d947246944c75bae0b62efa39580ecb9c1f57f141071de0055afde725c1d9ac95a78db55326b5e43388d44ba1c810b547239739115099297dc68e534674 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87 DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.89.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.89.ebuild new file mode 100644 index 000000000000..2d0af917a6cc --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.89.ebuild @@ -0,0 +1,130 @@ +# Copyright 2020-2021 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=5.15.5 + +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/v${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 ~ppc ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +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 + ;; + 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[@]}" +}