From: Peter Hoyes <peter.hoyes@arm.com>
To: meta-arm@lists.yoctoproject.org
Cc: Diego.Sueiro@arm.com, Peter Hoyes <Peter.Hoyes@arm.com>
Subject: [PATCH][langdale] arm/classes: Ensure patch files are sorted in apply_local_src_patches
Date: Tue, 10 Jan 2023 13:38:59 +0000 [thread overview]
Message-ID: <20230110133859.2230025-1-peter.hoyes@arm.com> (raw)
From: Peter Hoyes <Peter.Hoyes@arm.com>
apply_local_src_patches.bbclass was added in a previous patch to handle
the application of patch files located inside the fetched source code.
find is used to collect the patch files which does not guarantee the
order of its output. Pipe the output of find into sort to ensure patch
files are applied in the correct order.
Issue-Id: SCM-5864
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I1082fb7a726a7745289a5aa8bb6447bef57a94b0
---
meta-arm/classes/apply_local_src_patches.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arm/classes/apply_local_src_patches.bbclass b/meta-arm/classes/apply_local_src_patches.bbclass
index daa85f4c..e1939353 100644
--- a/meta-arm/classes/apply_local_src_patches.bbclass
+++ b/meta-arm/classes/apply_local_src_patches.bbclass
@@ -32,7 +32,7 @@ apply_local_src_patches() {
export QUILT_PATCHES=./patches-extra
mkdir -p patches-extra
- for patch in $(find $input_dir -type f -name *.patch -or -name *.diff)
+ for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort)
do
patch_basename=`basename $patch`
if ! quilt applied $patch_basename >/dev/null ; then
--
2.34.1
next reply other threads:[~2023-01-10 13:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 13:38 Peter Hoyes [this message]
2023-01-10 18:27 ` [PATCH][langdale] arm/classes: Ensure patch files are sorted in apply_local_src_patches Jon Mason
2023-01-13 18:05 ` Jon Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230110133859.2230025-1-peter.hoyes@arm.com \
--to=peter.hoyes@arm.com \
--cc=Diego.Sueiro@arm.com \
--cc=meta-arm@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).