From 5c42f084f7b42682560246f3fedb752ad6f67369 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Tue, 10 Jan 2023 10:45:36 +0000 Subject: [PATCH] arm/classes: Ensure patch files are sorted in apply_local_src_patches 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 Change-Id: I1082fb7a726a7745289a5aa8bb6447bef57a94b0 Signed-off-by: Jon Mason --- 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