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 1322315800F for ; Mon, 6 Feb 2023 19:04:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B1A5E07E2; Mon, 6 Feb 2023 19:04:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D5E36E07EA for ; Mon, 6 Feb 2023 19:04: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 F406B340B57 for ; Mon, 6 Feb 2023 19:04:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0ABB8A1 for ; Mon, 6 Feb 2023 19:04:34 +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: <1675708864.1f921586b3e2673b5d7b1267f80fc2c8b4f31b70.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.92.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1f921586b3e2673b5d7b1267f80fc2c8b4f31b70 X-VCS-Branch: master Date: Mon, 6 Feb 2023 19:04:34 +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: eab1e0d8-cdfc-4cec-a7fd-7d9fbd3dfcd9 X-Archives-Hash: 2db5753212417e3fb54ba74c24c9b468 commit: 1f921586b3e2673b5d7b1267f80fc2c8b4f31b70 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 6 14:26:02 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 6 18:41:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f921586 sys-kernel/vanilla-kernel: Bump to 5.15.92 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.92.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index e8b97164206a..e92746788f45 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -42,6 +42,8 @@ DIST linux-5.15.90.tar.sign 991 BLAKE2B 4bf285971970b04b8540e84feabb7c5fe0db8001 DIST linux-5.15.90.tar.xz 126497084 BLAKE2B a3c6147b4c39ec7de24f3564f0878fc8b72f0c69cc3ae3f964487b7da0821c54a3e714b0a6fbf55edf6555a515b9de967980984ab07646ee805d6c8c17cf4b73 SHA512 ef0e9e249ace8b9c006377a5169558f68dec4cdf455394809b1c9095081e3b00da53ee9cff13810a93533531736bcbdf335f0118021b6a8e92eae521de5097b7 DIST linux-5.15.91.tar.sign 991 BLAKE2B 0901b6e8e6d60cfc2d6d79b3e78f2d9b3c5fca78da75c9ddf77631d226712b82be2c0e65b9d41b8531b232a06b405e5e03e44cdf8711c871621a5f5a9cf0e0a2 SHA512 ab4156c781b18c184717be0cbcfdb1a061526548c89268fa12419dc75b5ba0a4a229907f49243c6b14aa1e0b8f3c1ca1766a8d71df89016e8055fb21777f0994 DIST linux-5.15.91.tar.xz 126504500 BLAKE2B 5da32ffa962d06ccc76ed5170b29ad93a1b5215659852616bdb134bcdf962720d9dac275bcc15e25d30c98796e9af6aad8919b1d054fe6e97577a29dd27fbfd2 SHA512 a0aa42164c11240a041a0b8290134db2eb895498b9c25594386b6e5242132abbf69323cd4f165184266ef5822c1a27c80488b3280823ff63b16a1773afe43650 +DIST linux-5.15.92.tar.sign 991 BLAKE2B 8ab6a8fbf48ff0117c1c5909ca2a01392f758b04c9579e7b11eeda8f9f38793626a83172dd45b8b0e8f266f6403aaac04d958879e7f13b2e5c58b8493f1c3f8f SHA512 80c7ef983d1fc6a939c38d3540f8757b9ff01206d0a524ef1f9c6ac4e3f197b1cdf48809d7de7f312c62e2ce626ca00a1472386a7a6041c615c50f8f6e983faf +DIST linux-5.15.92.tar.xz 126489552 BLAKE2B f6c115210b588dc1c46216ebe815e16e9f623ed3780ec5d946e808d8b4744c4abc38a136843f04eb9d50055d4d6ec941a8452167505da2fbfc9f7cddf8efbb33 SHA512 55733b6d9e30117fe3ca0f0611191addbe036542d1059b20bbe07e86f5448e94a52729af3ebb64fcfda979c9327dc014596a4e3412b291c3633bb977d0377a75 DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601 DIST linux-5.4.229.tar.sign 991 BLAKE2B eb0661f4b438e0fd40b61ba1472516f7f321edea790a650a1e80ed4a66d504db7896d3c23ca22946db2c8480a61da650f41a46e9551776ba7dfd3871a775947f SHA512 233778e0f61f1086dba340248c336efece761e59da300c1ce7397d577c58cd2c6667eb2975dc92e4dc2ef355e3d50239de6069fd87ba1038f9cb31d9ab46e51a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.92.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.92.ebuild new file mode 100644 index 000000000000..73bee2c2c4a6 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.92.ebuild @@ -0,0 +1,137 @@ +# 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.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g6 + +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=${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[@]}" +}