From 7eca1149112768040b408e1257de793d163ced41 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Tue, 27 May 2014 13:24:13 -0700 Subject: Implement missing syscalls * msync, pread64, setreuid and setregid * make merge.upstream.sh delete empty files Bug: 15145107 Change-Id: I6cf088ffffb6f8b048e2f0da612e78ea8bfc1499 --- merge.upstream.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge.upstream.sh') diff --git a/merge.upstream.sh b/merge.upstream.sh index eedc148ec..5c54da2b9 100755 --- a/merge.upstream.sh +++ b/merge.upstream.sh @@ -48,13 +48,13 @@ echo " vex : $upstream_vex_revision" if [ $upstream_valgrind_revision -gt $valgrind_revision ]; then echo "Merging valgrind... (in $valgrind_dir)" | tee $current_dir/merge.log cd $valgrind_dir - svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi if [ $upstream_vex_revision -gt $vex_revision ]; then echo "Merging vex... (in $vex_dir)" | tee -a $current_dir/merge.log cd $vex_dir - svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi echo "val: $upstream_valgrind_revision" > $current_dir/upstream.revs.txt -- cgit v1.2.3