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 30EDD15808B for ; Thu, 14 Apr 2022 06:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4F00E092D; Thu, 14 Apr 2022 06:47:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 EBFD6E092A for ; Thu, 14 Apr 2022 06:47:46 +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 E468A341907 for ; Thu, 14 Apr 2022 06:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BF7E303 for ; Thu, 14 Apr 2022 06:47:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649918843.7ee3ca6360da01565a4fc0ee08b8792eb5334fdf.sam@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.20.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7ee3ca6360da01565a4fc0ee08b8792eb5334fdf X-VCS-Branch: master Date: Thu, 14 Apr 2022 06:47:43 +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: 586f44b0-9050-4039-b7d7-7694562ef7ba X-Archives-Hash: 81bd02eb83ab6e087baf04babe474c72 commit: 7ee3ca6360da01565a4fc0ee08b8792eb5334fdf Author: Sam James gentoo org> AuthorDate: Wed Apr 13 23:39:14 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 14 06:47:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee3ca63 sys-kernel/vanilla-kernel: Bump to 5.16.20 Signed-off-by: Sam James gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.16.20.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index f206cd5da8c2..73a8efae66d7 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,5 +31,7 @@ DIST linux-5.16.18.tar.sign 991 BLAKE2B f6a1302ca215bdba4e2bcf7302086ef88245b75d DIST linux-5.16.18.tar.xz 127574448 BLAKE2B 0688856007dfc535d0da1c72f62e923693b88f6c365074135c5c4c10e30d8d94fca817fdda74d3efafae976b3118ab25f534310affe9149eb6a51823960be7f5 SHA512 87241c3f001850758aa9274033120dca41b8388eb0c22959790002c58ab3c99c1522eed46b5181e286e629986da3e974904b4ce640c499ff56b80e2b68e93a0e DIST linux-5.16.19.tar.sign 991 BLAKE2B 723e4602394a7bb01b77bcc5be16f7b84f1c26c16bf57bcade988a6ee9c902ed5f9b46a656d656a6d202d3ac9cf75b8cdb57c476675e423431ba817019135d9d SHA512 549a748da70ff05e463a09e7f000ffd166fe704f73091845c7490045e2aa082eae246c770503e9ad9c2cf2e10dc6bf203784447d6e0c1431f9b1fdf1a973be4b DIST linux-5.16.19.tar.xz 127614836 BLAKE2B d545c640ba95482927e52954eed833f326b511c9b798fd441352ecfe4f45396a332d5cf23119721e68dfd33241d6adac4d402bbb57d21cb8c5eb74d15dd851ab SHA512 cc3e95cb305c8981419b5b4ee801add040aae8a8117f886e7477ba8231b8e862b285a1384e3e3e0e5a4363e624dbf3bdfb686a5bcf3ca66b6db4bb0cba629797 +DIST linux-5.16.20.tar.sign 991 BLAKE2B c530988bde341b2852c6d74ebcdc98a6f8481fb523f1923de3f4b537a44ed57de367b976f49bfb37cfc195fca47a46212ecf097e1700658e2eb2e57595c460e5 SHA512 94cccc9684e312602aeed3157c3400028c0e5f5239a5923e519a61510a606ab87b49a7064c1ef0f5b24f22e47d133a8372ddf50cf5731311be401f7e71d61602 +DIST linux-5.16.20.tar.xz 127581772 BLAKE2B 798baf7051b3f20d34741067769c6a59a04ba922468789e61ce5a6c4d0c3d336a0f3bacc9f482827722e7577828140772e5cbd76b844cc836d4d6b26e0c154ec SHA512 21c55ab96ac571a16a4731089625f24918ec410849a8351304894bbb2b47f336586cd9d8f39a6b2e9b920ef0142dfbf758075dd6da606c3b9e936b5960cdc7bd DIST linux-5.4.188.tar.sign 991 BLAKE2B 544964d936af5ac8f877b2fd9fd3e858e1ea7bd82880ffed88493cc737a914285cfab6ec58019e42fbab3997b19148f4ec0925872179cecc1b7be62a02de6a04 SHA512 01fe913ef0da173dade0e0858f8032b01376223b1d99d381fc7118b38ed70cfba93435b97ce3e41f45159e952dd31db3a0bd67cdd32117379fd8847b236f05b2 DIST linux-5.4.188.tar.xz 112915792 BLAKE2B a2ea3b6c84edc952b8691903243464489b57284d8e7b49ff8d99d8790adadd1489d2d36ce36e4f357118ae5a61effc9f13eccfb97070ea99c8bec72344066aa1 SHA512 fc3cdac63f2add05662561388197380622f5da24d4683d8985e942d04a8f898f38a9dc53b2b045d32f2070494322d7570ffaf4a071a311bc99ea018d81d2ec88 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.20.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.20.ebuild new file mode 100644 index 000000000000..c065880f7dd0 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.20.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.19 +CONFIG_HASH=13503fa6c04411b42716c6522a8e456fe3360008 +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[@]}" +}