commit: 9f142aee35f943e94de733d63161da88d87d9dfe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 16 03:04:47 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=9f142aee
sys-kernel/gentoo-kernel: patch 6.1.53 for NFS issue Bring us up to genpatches-6.1-60 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.1.53-r1.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index a2fc40581bc9..a552b1859fb0 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -12,6 +12,8 @@ DIST genpatches-5.4-263.base.tar.xz 6140940 BLAKE2B 7a33829d7a85497a6a6c8ae89cc9 DIST genpatches-5.4-263.extras.tar.xz 1812 BLAKE2B 67a75053cc93216cd0b6f34e11c2cdb4d4606e7356424006d08d35583344ec09211d95d0e5613b7352a1b3317053c4c964d373736f387d76d0209bb915d9256d SHA512 64b041945553ca97df6291848e4a9875fb2a2526b82d730e6d84c6838c761803a819c9765cdf953130695e2c91af28b6b0a64a4e7d37473306b26d0db6c16f2c DIST genpatches-6.1-59.base.tar.xz 3488836 BLAKE2B 5e92e2d1c4ab691284991ae953eb4ec8f6ae5580d2ec410b94d4bd0c8644752d4be1fb962eb5f315b22d811bd49983f2fdb352523547d973fd712fe117f4452d SHA512 29963613fbe41485226137bb35e77daa4d4b2fb8eea6c18c6d9713f1d5cd27192273b3337ca4c02af6d2dba04c564be66edfda6ea6dbbebc22b9358875860288 DIST genpatches-6.1-59.extras.tar.xz 3808 BLAKE2B bad1dc9ff79b84c02f4f634764c6fdf5ef437c14076048d2e0b777f0ec967fe3dc544739684b50533accdf22d3d85af2c0422ba1183ba4ee26590d02c155cf5e SHA512 451bbbb7bce1263d97bce0580729e0a948021734d6e546e318ab37da786a848d9c2376c9849894be9bc8028ee9afece670b86727ded1cf9857d236869c113530 +DIST genpatches-6.1-60.base.tar.xz 3489052 BLAKE2B 528e6ddde93a9699899b0130c0f1fb3d4107c40e10ecee9a1ed813f6ebb2831f4b2340bc5932e98a7cacb79886d14b5ef5cab9f66b207f1304caba6200775be6 SHA512 05de7c393477abce8633185c588ced4568c3c7d5394d5db1a052942e4c417814149fd99f669521917847db482c442ad54b886b018c9edf20028cade120ae37b0 +DIST genpatches-6.1-60.extras.tar.xz 3808 BLAKE2B fd36141eca7e2e6c1f70b12af7ed21442b3b79ca63ce8dda25a7a090e94d752cdde9d6d3dd1b548c629820779126a78a774d071790d936fcf8668757111c22ae SHA512 a2a0affb5af269512403178d90f25d1776948d20c640fc29743846a44a0aca98f3883a5270dcbdec9eef99006b919769f6c702279647af159fedfd6e236acefe 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.53-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.53-r1.ebuild new file mode 100644 index 000000000000..541ef4107ad7 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.53-r1.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=g7 + +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[@]}" +}
