commit: 59671d574db0f932dbe9440d56c4d4a10411e884 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 21 10:53:40 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 21 10:53:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59671d57
sys-kernel/gentoo-kernel-bin: 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-bin/gentoo-kernel-bin-5.10.240.ebuild | 6 +++--- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.189.ebuild | 6 +++--- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.146.ebuild | 6 +++--- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.39.ebuild | 6 +++--- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.7.ebuild | 6 +++--- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.99.ebuild | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.240.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.240.ebuild index 1e2f0e3eb138..0b90175aef65 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.240.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.240.ebuild @@ -78,11 +78,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -92,6 +90,8 @@ src_prepare() { break fi done + + default } src_configure() { diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.189.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.189.ebuild index 1e2f0e3eb138..0b90175aef65 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.189.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.189.ebuild @@ -78,11 +78,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -92,6 +90,8 @@ src_prepare() { break fi done + + default } src_configure() { diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.146.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.146.ebuild index 0deca52ee57d..9f51e23b1b2d 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.146.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.146.ebuild @@ -78,11 +78,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -92,6 +90,8 @@ src_prepare() { break fi done + + default } src_configure() { diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.39.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.39.ebuild index 927a51d2543c..97d472ee0db1 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.39.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.39.ebuild @@ -85,11 +85,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -99,6 +97,8 @@ src_prepare() { break fi done + + default } src_configure() { diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.7.ebuild index d5d54e006c07..cddfb6415952 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.7.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.7.ebuild @@ -85,11 +85,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -99,6 +97,8 @@ src_prepare() { break fi done + + default } src_configure() { diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.99.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.99.ebuild index 81e8d2518ba2..76a30d0e56dc 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.99.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.99.ebuild @@ -85,11 +85,9 @@ src_unpack() { } src_prepare() { + local patch cd "${MY_P}" || die - default eapply "${WORKDIR}/patch-${PV}" - - local patch for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do eapply "${patch}" # non-experimental patches always finish with Gentoo Kconfig @@ -99,6 +97,8 @@ src_prepare() { break fi done + + default } src_configure() {
