21 presence is strongly encouraged to ensure that the archive contents don't |
21 presence is strongly encouraged to ensure that the archive contents don't |
22 change silently. If the signature results in a new key being added to |
22 change silently. If the signature results in a new key being added to |
23 tools/.gnupg/pubring.pgp, then as part of your code review, please show the |
23 tools/.gnupg/pubring.pgp, then as part of your code review, please show the |
24 diffs of the text version of the file by running |
24 diffs of the text version of the file by running |
25 gpg2 --homedir $WS/tools/.gnupg --fingerprint |
25 gpg2 --homedir $WS/tools/.gnupg --fingerprint |
26 both before and after the change. |
26 both before and after the change. Note that when merging, because |
|
27 $WS/tools/.gnupg/pubring.gpg is a binary file, you will have to choose |
|
28 the parent or child version. Pick one, then run: |
|
29 for cset in $(hg log -r 'parents()' -T '{node} '); do |
|
30 hg cat -r $cset $WS/tools/.gnupg/pubring.gpg | \ |
|
31 gpg2 --homedir=$WS/tools/.gnupg --import; |
|
32 done |
|
33 before you 'hg commit' your merge. |
27 * COMPONENT_BUGDB is the lower-case rendering of the BugDB cat/subcat. |
34 * COMPONENT_BUGDB is the lower-case rendering of the BugDB cat/subcat. |
28 |
35 |
29 These two are both initialized in make-rules/shared-macros.mk rather than any |
36 These two are both initialized in make-rules/shared-macros.mk rather than any |
30 component-level Makefile, but are frequently referenced from the latter. |
37 component-level Makefile, but are frequently referenced from the latter. |
31 * COMPONENT_DIR is the top-level directory of the given component in question. |
38 * COMPONENT_DIR is the top-level directory of the given component in question. |