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 4CABD158089 for ; Sun, 24 Sep 2023 02:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92FC72BC053; Sun, 24 Sep 2023 02:28:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 7A24C2BC053 for ; Sun, 24 Sep 2023 02:28:51 +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 6D77D3408DD for ; Sun, 24 Sep 2023 02:28:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27D2E1255 for ; Sun, 24 Sep 2023 02:28:48 +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: <1695522516.9c7edfcf3e7e8f387d819f5bb66d52fe21c25bc4.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-6.1.55.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9c7edfcf3e7e8f387d819f5bb66d52fe21c25bc4 X-VCS-Branch: master Date: Sun, 24 Sep 2023 02:28:48 +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: 2da18c1f-033d-4ef5-b172-2dad4276aaba X-Archives-Hash: 825aede0c7e086c40f71306bdc44578e commit: 9c7edfcf3e7e8f387d819f5bb66d52fe21c25bc4 Author: Michał Górny gentoo org> AuthorDate: Sat Sep 23 15:56:13 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 24 02:28:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7edfcf sys-kernel/gentoo-kernel: Bump to 6.1.55 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.55.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index b6812c54ab43..0363a5b4ad9e 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -28,6 +28,8 @@ DIST genpatches-6.1-60.base.tar.xz 3489052 BLAKE2B 528e6ddde93a9699899b0130c0f1f DIST genpatches-6.1-60.extras.tar.xz 3808 BLAKE2B fd36141eca7e2e6c1f70b12af7ed21442b3b79ca63ce8dda25a7a090e94d752cdde9d6d3dd1b548c629820779126a78a774d071790d936fcf8668757111c22ae SHA512 a2a0affb5af269512403178d90f25d1776948d20c640fc29743846a44a0aca98f3883a5270dcbdec9eef99006b919769f6c702279647af159fedfd6e236acefe DIST genpatches-6.1-61.base.tar.xz 3552112 BLAKE2B 173e2e31b444f7d88a9f6ad2253be4a8c0c2dec500b63d3695949d875970d1162f88c68c3c39b62428b63ae3c20fe4e03b7cd69680f2b4ef54f34ba5c2ddb4a1 SHA512 01f20a5cc610ecfa3fe026f8d1ed9987babdfc2648a623d721b756e4b9d307dcbfc0cfae385c40066619a297258927493c757df94454bc1a8b4a96f8d415af5b DIST genpatches-6.1-61.extras.tar.xz 3812 BLAKE2B 2c6cf3ccdef6c66bc321654e84582e0e0b0e8beb68a6fc390b2d526fd2da1f38603389a8aeeba031fb09a5e8493a0de3fbc944c172f7cb17d26dd91053817a17 SHA512 1a5bb61de1d22749d6dc9a1d3798d825a936cad0bcb045b52fd163fcd3381f8d284187b86c03a0688047d8720b2c387ec86202456df8b46e7ae84f9b0e37569f +DIST genpatches-6.1-62.base.tar.xz 3593184 BLAKE2B b9ede84287025cfb00e4772aecef49bb1528e3d47a4bfba110dc019ea94ed6319db1831ee765a497150e410e0d66029317c9859e951672207664345750531d5f SHA512 e1f5c54758b001cb9c4be6fcf0e92ad95cfe213b32186be0160bf5980ce1c6a77150f26baf89bf5e23c10c9c96df6ae3b5d77e2d84a4b792a93bb968a600fe58 +DIST genpatches-6.1-62.extras.tar.xz 3812 BLAKE2B 2f642be1d81a2e94221c9c713b8df8994953dcbac4d612bdad2f8e7d64111e8dfa4d988c105eea7d926e7fe08ec7232499e9bd8b8e2a9fccebf78d62bde91c43 SHA512 e06d58f69e3055ff38af09061daf6d0571590136fd154dd2ef2dfaca93d151391315abb5d45e252db4acadffbc7a87124c4ee50b6fffd278ce63fac819c38d12 DIST genpatches-6.4-18.base.tar.xz 1040816 BLAKE2B 61ce7d234cba40c266e92dbab80b26e9958d9501fe884ed1fe45c25a89f2385259d5776049d7ce172c05d6829a92f591652544d7a3ce3ce7c81d09ce871800f5 SHA512 559a4e9690a72dc76a0ab38f463149dc9221bad128b59fdafc1250b964af2ccf573ee0d4e593e98811f83325a0d10772a6a6b32bbaef50aee3c5a0d1938677d7 DIST genpatches-6.4-18.extras.tar.xz 3700 BLAKE2B b360eff83abdbed397db6405b6b68649a3d6f85a37716eb2f923d47dc3ae5d738ca49c29a58dd2f236c7f50dc233641e3df15b7b75a19364b0af6261afc36d4e SHA512 778791e5e9232bc432119d14a016c00e1a968af30f0a2dd931ebb4103f7f457db991eb1d9ca500d1a3c9295dbf87d9b4fab18ffaebbd46cc8c82077b27c344e6 DIST genpatches-6.5-4.base.tar.xz 258812 BLAKE2B df197ed4a66568eb823c889b15f126c66b6acb9a2cef224e198e576d601f1c5d1ba43bbecf510585adb93445f2fd634889714a31101fb2dddec67da9052adb7e SHA512 70b21a38cd4a2d1759819341365de33590d8d3f460d12cecd781dddbdc69e87e66f81389d8a1bea381bf74188c19b667d3c7789a92e3d8f80080982ba5d39872 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.55.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.55.ebuild new file mode 100644 index 000000000000..803053479832 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.55.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g9 + +DESCRIPTION="Linux kernel built with Gentoo patches" +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://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( 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 + ;; + riscv) + return + ;; + sparc) + return + ;; + 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[@]}" +}