X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_inf_yocto%2Fbuild_inf_yocto.sh;h=634f84d5136b9a083ed288c35fa7a27369dba643;hb=a3de56b6095390d224596b53f2dc482e1bf576b7;hp=74c6d0cd13fb61d3dd15572239d3910f89979e0d;hpb=466e83a2102a8ecb7639cb749e0143d621e501bc;p=pti%2Frtp.git diff --git a/scripts/build_inf_yocto/build_inf_yocto.sh b/scripts/build_inf_yocto/build_inf_yocto.sh index 74c6d0c..634f84d 100755 --- a/scripts/build_inf_yocto/build_inf_yocto.sh +++ b/scripts/build_inf_yocto/build_inf_yocto.sh @@ -351,23 +351,23 @@ prepare_src () { # Not any meta-patch is needed for the time being, but new ones may be needed and added # sometime in the future, so just leave these code commented out here. -# # Apply meta patches -# for l in $(ls -1 ${SRC_META_PATCHES}); do -# msg_step="Apply meta patches for ${l}" -# echo_step_start -# cd ${SRC_LAYER_DIR}/${l} -# -# # backup current branch -# local_branch=$(git rev-parse --abbrev-ref HEAD) -# git branch -m "${local_branch}_${TIMESTAMP}" -# git checkout -b ${local_branch} ${local_branch##*-} -# -# for p in $(ls -1 ${SRC_META_PATCHES}/${l}); do -# echo_info "Apllying patch: ${SRC_META_PATCHES}/${l}/${p}" -# git am ${SRC_META_PATCHES}/${l}/${p} -# done -# echo_step_end -# done + # Apply meta patches + for l in $(ls -1 ${SRC_META_PATCHES}); do + msg_step="Apply meta patches for ${l}" + echo_step_start + cd ${SRC_LAYER_DIR}/${l} + + # backup current branch + local_branch=$(git rev-parse --abbrev-ref HEAD) + git branch -m "${local_branch}_${TIMESTAMP}" + git checkout -b ${local_branch} ${local_branch##*-} + + for p in $(ls -1 ${SRC_META_PATCHES}/${l}); do + echo_info "Apllying patch: ${SRC_META_PATCHES}/${l}/${p}" + git am ${SRC_META_PATCHES}/${l}/${p} + done + echo_step_end + done } add_layer_stx_build () {