commit: 3fd899548e41766136538b793c07fb3f7e949ec6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 21 10:52:04 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 21 10:52:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd89954
sys-kernel/gentoo-kernel: Fix user patch order Fix src_prepare() so that user patches are applied after upstream and Gentoo patches. Closes: https://bugs.gentoo.org/960505 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/gentoo-kernel/gentoo-kernel-5.10.240.ebuild | 6 +++--- sys-kernel/gentoo-kernel/gentoo-kernel-5.15.189.ebuild | 6 +++--- sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild | 6 +++--- sys-kernel/gentoo-kernel/gentoo-kernel-6.12.39.ebuild | 6 +++--- sys-kernel/gentoo-kernel/gentoo-kernel-6.15.7.ebuild | 6 +++--- sys-kernel/gentoo-kernel/gentoo-kernel-6.6.99.ebuild | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.240.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.240.ebuild index 7f29cd4f11a2..6e127eeabab5 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.240.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.240.ebuild @@ -87,10 +87,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -102,6 +100,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.189.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.189.ebuild index a827911d497e..effdc83a4ea7 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.189.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.189.ebuild @@ -87,10 +87,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -102,6 +100,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild index 21a6081c2e6c..24e9e8b19822 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild @@ -88,10 +88,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -103,6 +101,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.39.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.39.ebuild index 2e4c54b5d72d..5cc9c5e9cd39 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.39.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.39.ebuild @@ -94,10 +94,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -109,6 +107,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.7.ebuild index 5cb01b31c737..1472b6b40c12 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.7.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.15.7.ebuild @@ -94,10 +94,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -109,6 +107,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.99.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.99.ebuild index 7c1e822f432a..abfbf82e7583 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.99.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.99.ebuild @@ -91,10 +91,8 @@ src_unpack() { } src_prepare() { - default - eapply "${WORKDIR}/patch-${PV}" - local patch + eapply "${WORKDIR}/patch-${PV}" for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -106,6 +104,8 @@ src_prepare() { fi done + default + local biendian=false # prepare the default config
