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 AA770158094 for ; Wed, 3 Aug 2022 20:20:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5970E0D30; Wed, 3 Aug 2022 20:20:17 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83412E0CCC for ; Wed, 3 Aug 2022 20:20:17 +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 46EAA335DC1 for ; Wed, 3 Aug 2022 20:20:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B919A553 for ; Wed, 3 Aug 2022 20:20:14 +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: <1659558010.3e4742d3df830b14286750f27555fa559b381018.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-5.15.59.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3e4742d3df830b14286750f27555fa559b381018 X-VCS-Branch: master Date: Wed, 3 Aug 2022 20:20:14 +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: 6e2d2fbf-ea24-458e-a0f7-e37e6675a721 X-Archives-Hash: 221b1546ff870f95d3bbb02b80d17dc3 commit: 3e4742d3df830b14286750f27555fa559b381018 Author: Michał Górny gentoo org> AuthorDate: Wed Aug 3 16:38:12 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Aug 3 20:20:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4742d3 sys-kernel/gentoo-kernel: Bump to 5.15.59 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.59.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index c0b284cc2b9e..6a541571b422 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -28,6 +28,8 @@ DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398c DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf208d62642df674863cc905dceb0e91d62cc3e64f1d0d4ed99f0ca9c010108b7df58a12a34b6291eab34f565d9d4ec69c2751 SHA512 17463a7d9e3a2e017654e78dcffba58114ec5cae5e67858f7f3c50bf14a92c1b488f85f4fd5fb61eb53fc74f6a90f0ab152ba9396d0d928050851b4c5ab643d7 DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0 DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c +DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6 +DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420 DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.59.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.59.ebuild new file mode 100644 index 000000000000..152f48b9400e --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.59.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + 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 )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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="-gentoo-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[@]}" +}