diff --git a/tools/images/bromite-source/apply-bromite-patches.sh b/tools/images/bromite-source/apply-bromite-patches.sh index 95e159b2..4451423b 100644 --- a/tools/images/bromite-source/apply-bromite-patches.sh +++ b/tools/images/bromite-source/apply-bromite-patches.sh @@ -9,11 +9,14 @@ cd chromium/src echo -e ${RED} ------- remove v8 subrepo ${NC} rm -rf v8/.git -git add -f v8 -git commit -m ":NOEXPORT: v8 repo" +git add -f v8 >/dev/null +git commit -m ":NOEXPORT: v8 repo" >/dev/null + +echo -e ${RED} ------- patches ${NC} +cat ../../bromite/build/bromite_patches_list.txt echo -e ${RED} ------- apply patches ${NC} -for file in $(cat ../../cromite/build/bromite_patches_list.txt) ; do +for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do if [[ "$file" == *".patch" ]]; then #if [[ "$file" == *"Automated-domain-substitution"* ]]; then @@ -24,11 +27,11 @@ for file in $(cat ../../cromite/build/bromite_patches_list.txt) ; do echo -e ${RED} " -> Apply $file" ${NC} REPL="0,/^---/s//FILE:"$(basename $file)"\n---/" - cat ../../cromite/build/patches/$file | sed $REPL | git am + cat ../../bromite/build/patches/$file | sed $REPL | git am if [ $? -ne 0 ] then - echo -e "Error on ../../cromite/build/patches/${file}" + echo -e "Error on ../../bromite/build/patches/${file}" exit 1 fi