| Message ID | 20170115100334.15694-1-lma@suse.com |
|---|---|
| State | New |
| Headers | show |
On Sun, 01/15 18:03, 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 overwrited because of permission issue. s/overwrited/overwritten/ Otherwise, the change looks fine to me. Reviewed-by: Fam Zheng <famz@redhat.com> > > This patch uses 'cp' instead of 'mv' to keep the qemu-version.h.tmp file, So > during the 'sudo make install' stage, new qemu-version.h.tmp's owner and group > wont be set to privileged user/group. > > Signed-off-by: Lin Ma <lma@suse.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 1a8bfb2..1ca45b2 100644 > --- a/Makefile > +++ b/Makefile > @@ -184,7 +184,7 @@ qemu-version.h: FORCE > printf '""\n'; \ > fi; \ > fi) > $@.tmp) > - $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) > + $(call quiet-command, cmp -s $@ $@.tmp || cp $@.tmp $@) > > config-host.h: config-host.h-timestamp > config-host.h-timestamp: config-host.mak > -- > 2.9.2 > >
diff --git a/Makefile b/Makefile index 1a8bfb2..1ca45b2 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,7 @@ qemu-version.h: FORCE printf '""\n'; \ fi; \ fi) > $@.tmp) - $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) + $(call quiet-command, cmp -s $@ $@.tmp || cp $@.tmp $@) config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak
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 overwrited because of permission issue. This patch uses 'cp' instead of 'mv' to keep the qemu-version.h.tmp file, So during the 'sudo make install' stage, new qemu-version.h.tmp's owner and group wont be set to privileged user/group. Signed-off-by: Lin Ma <lma@suse.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)