Skip to contentSkip to conversation

Makefile: Fix owner and group for qemu-version.h.tmp

PATCH RESEND In review Lin Ma 2 participants 5 messages Feb 13, 2017 – Feb 14, 2017 Kbuild

lore
Share & tools
lore

Lin Ma

author
#0 lore raw

PATCH RESEND v2 1/1 Makefile: Fix owner and group for qemu-version.h.tmp

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 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.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 1a8bfb2..1ca45b2 100644
@@ -184,7 +184,7 @@ qemu-version.h: FORCE
 				printf '""\n'; \
 			fi; \
 		fi) > [email protected])
-	$(call quiet-command, cmp -s $@ [email protected] || mv [email protected] $@)
+	$(call quiet-command, cmp -s $@ [email protected] || cp [email protected] $@)
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
Signature · 1 line
2.9.2
#1 lore raw
Quoted 5 lines · Lin Ma

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.

But why does the content of .h and .h.tmp not match during "make install"?

Paolo

Quoted 10 lines
Makefile +1 -1
index 1a8bfb2..1ca45b2 100644
@@ -184,7 +184,7 @@ qemu-version.h: FORCE
 				printf '""\n'; \
 			fi; \
 		fi) > [email protected])
-	$(call quiet-command, cmp -s $@ [email protected] || mv [email protected] $@)
+	$(call quiet-command, cmp -s $@ [email protected] || cp [email protected] $@)
author
#2 lore raw
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

Paolo Bonzini <[email protected]> 2017/2/13 星期一 下午 6:07 >>>

Quoted 8 lines
Quoted 5 lines · Lin Ma

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.

But why does the content of .h and .h.tmp not match during "make install"?

The content of qemu-version.h recorded the git head info of last build. After 'git pull && make ', Because the content of qemu-version.h.tmp is generated based on the lastest git describe, Now this .h.tmp and the old .h aren't consistent, So this .h.tmp will be renamed to qemu-version.h.
Then during 'sudo make install', because there is no .h.tmp any more, a new one will be generated with privileged permissions.

Thanks,
Lin

#3 lore raw
Quoted 10 lines · Lin Ma

The content of qemu-version.h recorded the git head info of last build. After 'git pull && make ', Because the content of qemu-version.h.tmp is generated
based on the lastest git describe, Now this .h.tmp and the old .h aren't consistent,
So this .h.tmp will be renamed to qemu-version.h.
Then during 'sudo make install', because there is no .h.tmp any more, a new one will be
generated with privileged permissions.

So is the bug that the "cmp || mv" should be changed to "if cmp ...; then mv ...; else rm ..."?

Paolo

author
#4 lore raw
Quoted 17 lines
Quoted 3 lines
Quoted 3 lines

Paolo Bonzini <[email protected]> 2017/2/13 星期一 下午 7:55 >>>

Quoted 10 lines · Lin Ma

The content of qemu-version.h recorded the git head info of last build. After 'git pull && make ', Because the content of qemu-version.h.tmp is generated
based on the lastest git describe, Now this .h.tmp and the old .h aren't consistent,
So this .h.tmp will be renamed to qemu-version.h.
Then during 'sudo make install', because there is no .h.tmp any more, a new one will be
generated with privileged permissions.

Quoted 2 lines

So is the bug that the "cmp || mv" should be changed to "if cmp ...; then mv ...; else rm ..."?

Yes, It makes sense, and this way can avoid leaving the qemu-version.h.tmp in the folder after build. I'll send patch v3 based on it and the patch title will be changed to 'avoid leaving the temporary QEMU_PKGVERSION header file'.

Thanks,
Lin