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 734DC15808B for ; Mon, 28 Mar 2022 15:52:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1470CE09B0; Mon, 28 Mar 2022 15:52:25 +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 A3B64E0968 for ; Mon, 28 Mar 2022 15:52:24 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 777143413C6 for ; Mon, 28 Mar 2022 15:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92863177 for ; Mon, 28 Mar 2022 15:52:21 +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: <1648482727.5b1cecc48a013d8ff2e0275acc6d3052211222ec.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.16.18.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5b1cecc48a013d8ff2e0275acc6d3052211222ec X-VCS-Branch: master Date: Mon, 28 Mar 2022 15:52:21 +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: 53491e17-9d6a-489d-8df3-35fb9b32efc6 X-Archives-Hash: db8d248de3b3db8ba16c18bd2d2f3ed3 commit: 5b1cecc48a013d8ff2e0275acc6d3052211222ec Author: Michał Górny gentoo org> AuthorDate: Mon Mar 28 12:27:23 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Mar 28 15:52:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1cecc4 sys-kernel/vanilla-kernel: Bump to 5.16.18 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.16.18.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 7552152fbb28..cbbf130d5d8d 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -33,6 +33,8 @@ DIST linux-5.16.16.tar.sign 991 BLAKE2B ae5b61e2d369bb51219186795328fe72663acc73 DIST linux-5.16.16.tar.xz 127585324 BLAKE2B 2dea3250907d3fb74a91f5f482417b41f634d8dcc847fde84595e3f7069323af5d396c4f737e48e7ba68c1bc7ce7049ceabca48fc429b8c672c55b185b818775 SHA512 a922b950fd3803b922be40c826554359f44f9eea8bc44be89c1db1e7173fb7726601373fdf37256eab85a644eccc774fdbcec407c7154c233117e0331f028ef8 DIST linux-5.16.17.tar.sign 991 BLAKE2B 730b8f23a4149f716a549a003cf7ee37cbb6503d57ca48d800e63e659e079a095351a1b21edf55c0398eb059c7cc9c8af7e4bf1f314e70ff86730e691bfd137e SHA512 9eb47598cd431d0f02f59da709190455e87f309465a00fe794dd3da988d883162b7ba6636e76babe33b2ffd22d701303946e190d6ea2f02659e9355f1846b112 DIST linux-5.16.17.tar.xz 127578748 BLAKE2B ba48ac26f61ee5614ebf8cd57e3c6e26aac188068216912308e3666d9529be8812e725c9448ef7413a2de36ff35c9cb2bddc3c11c7afd339a722d48a4cf998c2 SHA512 414403512737fcbdb11974a4473ea2a201dcb3f03b009a07cb09f93cb3e502348af52deb4969e94a3594e1b8dda8969452b1c86b95ec5837a2865347a77594dc +DIST linux-5.16.18.tar.sign 991 BLAKE2B f6a1302ca215bdba4e2bcf7302086ef88245b75d99b299ea29ddb13754af48e51df26b6e444fb05279cbf645cfca6b88d5ca08e22fdc48b62255d8e36b051d40 SHA512 3d3acfb75d44f9b515d6459afa00aaa7a2be9464229db48993af4a09affc69b5aa27ddb5bc516031a34eceeb9c4b4ea8792b01dd802ae2b0bf9330d77f341be8 +DIST linux-5.16.18.tar.xz 127574448 BLAKE2B 0688856007dfc535d0da1c72f62e923693b88f6c365074135c5c4c10e30d8d94fca817fdda74d3efafae976b3118ab25f534310affe9149eb6a51823960be7f5 SHA512 87241c3f001850758aa9274033120dca41b8388eb0c22959790002c58ab3c99c1522eed46b5181e286e629986da3e974904b4ce640c499ff56b80e2b68e93a0e DIST linux-5.4.185.tar.sign 991 BLAKE2B 5508bfda73f95b84314ebb907181befe43615af569a15aa7fa01a27ba8ebcf60453ca4082e3a5c405d76bc0f5ae9616977237fae620152d41911e47de32797f7 SHA512 9004a8d3a414119e9c482e1dfbb4bc775977986b311aadd4f4c59d2acf10d0721c8110cae59eb48428e9d12dda6903d27d30f2bfc766a52e267f1a2c66573069 DIST linux-5.4.185.tar.xz 112889592 BLAKE2B f44cf6b306b254533f15dff3820bf014937fcec88c75468da84b4eb403cbe1fa5ca5a830ee5f73fb3c57b7af1510cb6a7ede531836e6599c5b044e353fa11b3c SHA512 491faf373500757f77e26e4cb402b51bc79ef220ac90579b02fa2cd25f7e524873fe4b5f971a71d41d198baed9905154c21b70c0387c2ba2285d3f1da730e6f7 DIST linux-5.4.186.tar.sign 991 BLAKE2B 6272e71e1e9b34590c73eeabdba16f1224405617fd9a57fa94090c2d697f51499c6e77424616dc043c37c0e68a519c736396394b97d4f93b519b1fe9f22e6a0e SHA512 d69a8c97815396fc01e24930df2c39db17894cd52081967de98d9179856253db8a20b86cb172cf1120d6d157d5a7258d9a192687da60614fef7c3fed49f96b8d diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.18.ebuild new file mode 100644 index 000000000000..42cf43a0cc25 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.18.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.16.16 +CONFIG_HASH=95484c155424c62930acc1c61803f608af3f1cbc +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 ~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[@]}" +}