| Message ID | 20230110104536.686539-1-peter.hoyes@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm/classes: Ensure patch files are sorted in apply_local_src_patches | expand |
On 10/01/2023 10:45, Peter Hoyes wrote: > 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 Please can this patch be backported to langdale. Thanks, Peter > --- > 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
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