mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm/apply_local_src_patches: allow use in multiple directories

Browse Source 
Pull out the patch application logic so the postfunc by default scans
for patches in LOCAL_SRC_PATCHES_INPUT_DIR and applies them to
LOCAL_SRC_PATCHES_DEST_DIR as before.

This allows recipes to inherit the class and directly call
apply_local_src_patches as needed to process patches in multiple
directories.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2023-09-29 16:21:19 +01:00
committed by Jon Mason
parent fd13de4f85
commit be76055bdc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/classes/apply_local_src_patches.bbclass
+8 -3
View File
@@ -17,8 +17,8 @@ python() {
apply_local_src_patches() { apply_local_src_patches() {
input_dir="${LOCAL_SRC_PATCHES_INPUT_DIR}" input_dir="$1"
dest_dir="${LOCAL_SRC_PATCHES_DEST_DIR}" dest_dir="$2"
if [ ! -d "$input_dir" ] ; then if [ ! -d "$input_dir" ] ; then
bbfatal "LOCAL_SRC_PATCHES_INPUT_DIR=$input_dir not found." bbfatal "LOCAL_SRC_PATCHES_INPUT_DIR=$input_dir not found."
@@ -32,6 +32,7 @@ apply_local_src_patches() {
export QUILT_PATCHES=./patches-extra export QUILT_PATCHES=./patches-extra
mkdir -p patches-extra mkdir -p patches-extra
bbdebug 1 "Looking for patches in $input_dir"
for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort) for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort)
do do
patch_basename=`basename $patch` patch_basename=`basename $patch`
@@ -45,4 +46,8 @@ apply_local_src_patches() {
fi fi
done done
} }
do_patch[postfuncs] += "apply_local_src_patches"
do_apply_local_src_patches() {
apply_local_src_patches "${LOCAL_SRC_PATCHES_INPUT_DIR}" "${LOCAL_SRC_PATCHES_DEST_DIR}"
}
do_patch[postfuncs] += "do_apply_local_src_patches"