On Wed, 02/15 10:40, Lin Ma wrote: > By commit 67a1de0d, When we perform 'git pull && make && sudo make install', > In 'make' stage a qemu-version.h.tmp will be generated. If the content of > qemu-version.h.tmp and qemu-version.h aren't consistent, The > qemu-version.h.tmp > will be renamed to qemu-version.h. Because of the target FORCE, The same > action > will be do again in 'make install' stage. > > In 'make install' stage, If there is no qemu-version.h.tmp exists and we run > 'make install' with sudo, The owner and group of new qemu-version.h.tmp will > be > privileged user/group. When we run 'make' next time, qemu-version.h.tmp can't > be overwritten because of permission issue. > > This patch removed qemu-version.h.tmp after build to fix this issue. > > Signed-off-by: Lin Ma <l...@suse.com> > --- > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index b993741..830fa5a 100644 > --- a/Makefile > +++ b/Makefile > @@ -299,7 +299,11 @@ qemu-version.h: FORCE > printf '""\n'; \ > fi; \ > fi) > $@.tmp) > - $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) > + $(call quiet-command, if ! cmp -s $@ $@.tmp; then \ > + mv $@.tmp $@; \ > + else \ > + rm $@.tmp; \ > + fi) > > config-host.h: config-host.h-timestamp > config-host.h-timestamp: config-host.mak > -- > 2.9.2 >
Reviewed-by: Fam Zheng <f...@redhat.com>
