commit: c701dda61770be9b23141b377fcff63c9be1ad7d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 16 03:05:50 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 16 07:03:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c701dda6
sys-kernel/gentoo-kernel: patch 6.5.3 for NFS issue Bring us up to genpatches-6.5-5 for a backported NFS fix. Bug: https://bugs.gentoo.org/914204 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.5.3-r1.ebuild | 147 +++++++++++++++++++++ 2 files changed, 149 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index a552b1859fb0..1e043de46807 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.4-18.base.tar.xz 1040816 BLAKE2B 61ce7d234cba40c266e92dbab80b2 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 DIST genpatches-6.5-4.extras.tar.xz 3696 BLAKE2B ca8bf3d3b195dbfea39b27b574ea3f3e99f843604ce8ed6ffac141e2e198a4721a943d24c0bfeb559570f00985e6371c7badb69e94542af7bb291fa2485d5425 SHA512 db11e8db7f3fbbed7a037c4a8ebe47accefa9794e8a201e6e022adcdfc628ce3d2db9ccdcb0b0133e3b7956fdab9f63fbc3140f1759b31d2c1878f4075de9d2c +DIST genpatches-6.5-5.base.tar.xz 259352 BLAKE2B 57e87c7c7517a4f4860b90dc9054ba41e37044cd83318169b37e3ed15db3cbd80a385b76be12ffd423cb6236f98c47512f361aaf1aad07b78d031056e08409e4 SHA512 f69238963e96ef2842c55a4f786dbc692b96dc8b9c4ef31416592b5f3cbfec875f95a0417628a0aa010e5b06cae03073a0c4ea0107f180c8efa4055686eea47d +DIST genpatches-6.5-5.extras.tar.xz 3700 BLAKE2B 6a9037df5d22ac2cdfc765e99f29660b694d1ae030b179b1efcbf4da086114c6e5befe93368841735f306c827354fec9e40c0bee057a2f1af963dc41679bdd91 SHA512 72b23278c5b84fcbc91143d29e2d769aebc337d45d372999f91f72b3be6802cd410df2735d79f19accd0a775b875f26276dc99c605352c987e790f626dad1051 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628 DIST gentoo-kernel-config-g8.tar.gz 4663 BLAKE2B c832df9e2085c6ec2deef5b54195f24d2d8ee039655534f5d9c1d650e06ed2ebfe82e2e62d2119696944353321bc22eb91a0599b06c90f0ac22b280fd4aa81b6 SHA512 64c9a94935e7525152827a1d7ca79259f8770300c5865995d683b4c7ba5f21670681a60153ad268aa0a0ce6c2b18683e7faacdbdfb5adc6248387e7316dbb12e DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.3-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.3-r1.ebuild new file mode 100644 index 000000000000..154f22e183f7 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.3-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.5.2-gentoo +GENTOO_CONFIG_VER=g8 + +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[@]}" +}
