From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1591206-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 D4BB315838C for <garchives@archives.gentoo.org>; Tue, 16 Jan 2024 16:42:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00369E2A79; Tue, 16 Jan 2024 16:42:47 +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 D76F6E2A79 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 16:42:46 +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 B3862343255 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 16:42:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DAA8FB39 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2024 16:42:42 +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: <1705423351.3fd98d6371b11012364a1bfedd55b36f955600b1.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.15.147.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3fd98d6371b11012364a1bfedd55b36f955600b1 X-VCS-Branch: master Date: Tue, 16 Jan 2024 16:42:42 +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: 80458c98-5990-4c58-a674-28a7490fd7cc X-Archives-Hash: ca0dd3e539c25d7dc27cabd96eae6829 commit: 3fd98d6371b11012364a1bfedd55b36f955600b1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jan 15 19:53:37 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 16 16:42:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd98d63 sys-kernel/vanilla-kernel: Bump to 5.15.147 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.147.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 74d6218ce1e6..d28c8c1df8da 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -28,6 +28,8 @@ DIST linux-5.15.145.tar.sign 993 BLAKE2B 34a28ff96ea10ff95320f528def79964f030765 DIST linux-5.15.145.tar.xz 126579464 BLAKE2B f8481b1fec05a75a10d32c512f0600f3a359008b30dce3bac35b00928750650faae013e26bb23d6634618e86f2a700d0342c68869c960c76ead4d415e2c1bd05 SHA512 f5b7acf9ed52b70bcc564e0b13b95e9a352196074b093513c7c74ad7f8bdd3c8938a2860c993590b5289690ac344af94c7a99c496218ce597525671c395d5a72 DIST linux-5.15.146.tar.sign 993 BLAKE2B 4dc2ea0eb1d87eab3250e1c7e3f3a0bead8419c3013a797866edee58dd6bab28396ea7b8a07afd8d7542ac2736a3f66956b17df300afd9bf59bc156c6641229c SHA512 42498bd112fff860f492e53b6556b4abce3c04143d6b46cdef94a6c6121d26d534a1e91542997488aebdece342c8cfcd321e6e44a9bf5a74c9a9a987f3872572 DIST linux-5.15.146.tar.xz 126604620 BLAKE2B b23cfb05e5f90088fa084f8f4827e965a063f546304ec22ff505a25c2dde389bc5e00d50e631d5778be63ba441093c5f5b80f875eb41f6a97cbfc950f0bcb35f SHA512 c2b6c86af63959898ad1cacb7c1ea9c5cb784042009b9d2fd57766e67095e7c3ad51e7f42b1fcee7404454e419dcbeacb1a9d5c4888442c3a51a08a295e342dc +DIST linux-5.15.147.tar.sign 993 BLAKE2B 8ce7e241fb18e88805a947ccd20414b073e90ea6a4b0c09683a3a5f56d8542ab262b26842bd3b3a678937b4fa01fddffb8910c0db7c9015bafa8c8b8b707feec SHA512 0390a4084b356108f50750e43bea4c1924ec042d149a4bb3e5ef63c621a0913ea3c3dc6d7275b1a78072c5804a6bd03d103d342f38b817a120637303b9b4a586 +DIST linux-5.15.147.tar.xz 126590916 BLAKE2B 9393691267076e27e5b46f7e734e67d42839380c5d3054dadf1d2a9178f3061d710cab1ec14f2c6641ee44cd83a0df8881a1d10ccee4e1e7bdf9bd182a3b6c49 SHA512 6942be1260060544d27bfceff143d85b9cccc801b5f97c82ac75527fe9e0bec245e17bfde932f6886a1b0c76b1140af558e6467ba9b750ea3bff651a27386340 DIST linux-6.1.69.tar.sign 989 BLAKE2B 354a497dc3ba0b2c00f374f3339b3970b95b0a83b933d0ad24f3855129379a7a7829b381a0b9aa5eb9c899cb99f8ff4912f28841653a9436cd2149d118116ef2 SHA512 b19b5c33c40ad494181f75141653b77ff9ae0ede9e183da5e124f973e500a9d87824057153b3835cea29f3f33cae60b6ea4f3b3506b2d2c3941750834e760f57 DIST linux-6.1.69.tar.xz 135035040 BLAKE2B 21038f291c7eb06f6fbe866132c0805d5784e3ed53dd089cfe97c95569701776d20e84f39e6d687ec7ddc06db9608045a16bc5b204a8a95f6fd269a1e8f41cc9 SHA512 70afe2642b58cb0a1a5b38867e00052b3236f7701d9d006f0d95c66f204935453e997bd8b4d28c890617e745e08610d39933ef0798ede13f230485a8222b9819 DIST linux-6.1.70.tar.sign 989 BLAKE2B 25bd23eab2b1afcdd401f93946b73c05eb2fd2079ae01cfc0114b8af19ad0154e065b87f7bb32d4b756faaacdc1e5dd05df5fea89fd37feb4e9d1efa69402bac SHA512 1efd254c0ddb8911b9a71944d35dc2f832f36c200e0c71d364b736d0bddc09cac7d3604da996d97de12768d745575c62bc1dfeb255287c3cc78cfcc95cdfb784 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.147.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.147.ebuild new file mode 100644 index 000000000000..13b57074926b --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.147.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 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.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g11 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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=/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[@]}" +}