| Message ID | 20230929152128.3401009-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] arm/apply_local_src_patches: allow use in multiple directories | expand |
On Fri, 29 Sep 2023 16:21:19 +0100, ross.burton@arm.com wrote: > 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. > > [...] Applied, thanks! [01/10] arm/apply_local_src_patches: allow use in multiple directories commit: be76055bdccaa476f6b68abf1ff26c007d4717c9 [02/10] arm/trusted-services: pass through CMake generator commit: 893b20fbee25b7a9a6791ec415fe6117ddeb2cd8 [03/10] arm/trusted-services: add missing pkgconfig inherit commit: 7a126f00ded5a4cf013df80e75198c1f55883eca [04/10] arm/trusted-services/ts-remote-test: move binary to $bindir commit: 909d49fa6f5eaf3ee686b5f6c0eee5ed4a830d47 [05/10] arm/trusted-services/ts-sp-env-test: add missing DEPENDS commit: 549e05e486cb55697adf2fd068e6cc22dd194942 [06/10] arm/trusted-services/ts-sp-env-test: remove commit: 67deb2cf1bbfd343cc2bb847bd625a5e3b79ed74 [07/10] arm/trusted-services: use apply_local_src_patches commit: 46e6f42e31a239aee59255022742819ea1ed6aaf [08/10] arm/trusted-services: upgrade nanopb and fix build races commit: 210a6ace832534cb1a492649e3e61532e9ca6a8f [09/10] CI: use a venv for sphinx commit: dbad5d928199e3feae0acb43cc23c6daeacc7f1b [10/10] CI: upgrade to Kas 4 container commit: 4d76ed4c75dbfef8bb444777dab9fae88e3dcaaa Best regards,
diff --git a/meta-arm/classes/apply_local_src_patches.bbclass b/meta-arm/classes/apply_local_src_patches.bbclass index e1939353..0897b51b 100644 --- a/meta-arm/classes/apply_local_src_patches.bbclass +++ b/meta-arm/classes/apply_local_src_patches.bbclass @@ -17,8 +17,8 @@ python() { apply_local_src_patches() { - input_dir="${LOCAL_SRC_PATCHES_INPUT_DIR}" - dest_dir="${LOCAL_SRC_PATCHES_DEST_DIR}" + input_dir="$1" + dest_dir="$2" if [ ! -d "$input_dir" ] ; then bbfatal "LOCAL_SRC_PATCHES_INPUT_DIR=$input_dir not found." @@ -32,6 +32,7 @@ apply_local_src_patches() { export QUILT_PATCHES=./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) do patch_basename=`basename $patch` @@ -45,4 +46,8 @@ apply_local_src_patches() { fi 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"