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 4080115800A for ; Fri, 11 Aug 2023 16:56:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81B5F2BC016; Fri, 11 Aug 2023 16:56:23 +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 603782BC016 for ; Fri, 11 Aug 2023 16:56:23 +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 695DB335D1E for ; Fri, 11 Aug 2023 16:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0234DBE8 for ; Fri, 11 Aug 2023 16:56: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: <1691772922.a8669589ed1eb4c507fcfb8771617b6d99293842.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.126.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a8669589ed1eb4c507fcfb8771617b6d99293842 X-VCS-Branch: master Date: Fri, 11 Aug 2023 16:56: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: 3e4050c8-4075-41c6-84ef-ec9b0ff8159a X-Archives-Hash: 92cc6682800dfd1fd2fc425021085c8f commit: a8669589ed1eb4c507fcfb8771617b6d99293842 Author: Michał Górny gentoo org> AuthorDate: Fri Aug 11 15:36:00 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Aug 11 16:55:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8669589 sys-kernel/vanilla-kernel: Bump to 5.15.126 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.126.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index fbedf626545d..bf523a10f75f 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -40,6 +40,8 @@ DIST linux-5.15.124.tar.sign 993 BLAKE2B c6198c13831a398c2bc33182d0878147744838b DIST linux-5.15.124.tar.xz 126528040 BLAKE2B 06594b2701dbdd5a6d65be8fd734f44b4280a7561e607cb25f276124d8dfe600921cc50ddf28bddd40fed0ac931e3a1818328258c670cc9d032fe52533e6a0ab SHA512 fa907e359ed9db5e9cc10755be7b147813fb4d0f04b3537a9b169508633a2d818afa94ba1f40c425311861055fd5004b6a75c4caa270d06f00fb3b98e3adee8c DIST linux-5.15.125.tar.sign 993 BLAKE2B d2adeae32bfb7fc6feceb2bb68d8a1e844dc05d40665159815060bfcbb98684897393ab67df41820c99e666b8885e71d654e1e9b837eddf8f945b6ba16187c9b SHA512 c743d439497e3ba972bc36a687378bca9789a0f342d2e37b6aa2eb86fe0483ad6f0f8c13eefe7dc32273f8a58b4e8b2570df92cba1d3b457fcfa97c056234a02 DIST linux-5.15.125.tar.xz 126519580 BLAKE2B 070ce222646d458f37061103941cfbda967ea671c1aa8b7c4a886a4409c6efae78054c73020fda3b43c668b402ecb082220999f8eafa13a461064d688266c67b SHA512 97cbd8b6453a904c53c0681c31a713189ea856f4064c6801434fe92518c94faedd59e6103c1960b49d32800be8fe741d8e05dc13f4ee8ce4afa0b37fc3446461 +DIST linux-5.15.126.tar.sign 993 BLAKE2B 99bc828650df3559193d30e302714ae1a2a7348afc3ac6aedcb8978199bf488efa3048391587b7d14f284c2c836fd2cb3dd2303448014b8b335d60d294f5ff47 SHA512 048acf1dbdd9ef3b27990529fddd2b8a1ff831cf6a93c2ecefdaf1b70328507e6a2af888227b1539344753d0aa0da5bf17fe46e8d47ca1b4e28bd9e733624699 +DIST linux-5.15.126.tar.xz 126547080 BLAKE2B 53ed74818ae98725878f94c4e3df46a86030ea32aadd0433b884779fb069866c8186584367ae09017cd58ecc4e16e3c2aecb999330d16cff37a8c00a8de6a083 SHA512 7dfcb581170abc7faa87c89ae721d24d221268351ed73c6313c169c98e7db5c5967d2a720472249f9f11274d3df6aa223d0eca43bc54965b70e74a19c6e9352c DIST linux-5.4.250.tar.sign 991 BLAKE2B 9650c44958c2d5c9c7a7bb1226e2e58e0bd50ba902d7df077c0ea9d9515d46da00576a69e7c493b25cbcaa3863e82fb7ccb17bd2d2828d4f90cfa5abb39a9b57 SHA512 770b4549a47a2d7118bb11d8d4c96562d5d2ba19813e72dc73faead4e5071367f1f549e4a03d9cda945115605631b10c1b25ecc6537637de10f2c3e54ecefea7 DIST linux-5.4.250.tar.xz 112964116 BLAKE2B 979b6936a86a58b4d3c92af6ac32243a20c074e14ec914421fe0605ef28a64329f25071bcb8a4aa09ffb78851c9f4c44419892d917affd9c9d29789ccb7c572a SHA512 939b3986490cfdce0ebb214ee87c523cb3ed322729e3cdac9991ab6489c3bc5bfc08651680c3a4010bad98480a23ad28d799fb787b85969846f1e440c167f5bb DIST linux-5.4.251.tar.sign 991 BLAKE2B 8f855e7ed57579bbc4e8f94bca8d5a51d26073b40add5e1a9c5cf85b16980f8ee5cb6e98227a4a583af37ec66802d972393339a4f26e20edcf559c043847f88e SHA512 3dbd0434a9b9a97f39318c94a3d03a63f9d15c9aa5b3c4388df5b8a0f4ef1bf68d7ff6ac91f453883d9f614acfba8751644ca6b2534df785fad72e8ef67fe466 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.126.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.126.ebuild new file mode 100644 index 000000000000..f68caf0fd433 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.126.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=g7 + +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[@]}" +}