[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 2/6] build: don't create temporary files in source
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 2/6] build: don't create temporary files in source dir |
Date: |
Tue, 7 Nov 2017 10:16:38 +0000 |
There are cases where users do VPATH builds with the source directory being on
a read-only volume. In such a case they have to manually run the command
'git-submodule.sh ...modules...' ahead of time. When checking for status we
should not then write into the source dir.
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
scripts/git-submodule.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 039f782d81..21909ea413 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -39,10 +39,9 @@ fi
case "$command" in
status)
test -f "$substat" || exit 1
- trap "rm -f ${substat}.tmp" EXIT
- $GIT submodule status $modules > "${substat}.tmp"
- test $? -ne 0 && error "failed to query git submodule status"
- diff "${substat}" "${substat}.tmp" >/dev/null
+ CURSTATUS=`$GIT submodule status $modules`
+ OLDSTATUS=`cat $substat`
+ test "$CURSTATUS" = "$OLDSTATUS"
exit $?
;;
update)
--
2.13.6
- [Qemu-devel] [PULL v1 0/6] Merge build 2017/11/07, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 3/6] build: allow automatic git submodule updates to be disabled, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 1/6] build: allow setting a custom GIT binary for transparent proxying, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 5/6] build: delay check for empty git submodule list, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 2/6] build: don't create temporary files in source dir,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 6/6] build: remove use of MAKELEVEL optimization in submodule handling, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 4/6] build: don't fail if given a git submodule which does not exist, Daniel P. Berrange, 2017/11/07
- Re: [Qemu-devel] [PULL v1 0/6] Merge build 2017/11/07, Peter Maydell, 2017/11/07