ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix getting pubkey_id from depot user pubkey

Browse Source 
On systems with the option `use-keyboxd` enabled in config, option
`--no-keyring` in gpg command line doesn't work. The result of the
pubkey_id function will be the first key in the keybox keyring instead
of the id of pubkey from the depot user.

Fixes genodelabs/genode#5235
genodelabs/goa#92
This commit is contained in:
Ivan Loskutov 2024-05-23 06:24:13 +02:00 committed by Christian Helmuth
parent 86895d6a5c
commit 649653eb1c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tool/depot/mk/gpg.inc
View File

@ -15,10 +15,9 @@ pubkey_path = $(firstword \
# obtain key ID of 'depot/<user>/pubkey' to be used to select signing key
pubkey_id = $(shell pubkey_file=$(call pubkey_path,$1); \
$(GPG) --yes -o $$pubkey_file.dearmored --dearmor $$pubkey_file; \
$(GPG) --with-colon --no-default-keyring --list-public-keys \
--keyring $$pubkey_file.dearmored |\
head -n 2 | tail -n 1 | cut -d: -f5; rm -f $$pubkey_file.dearmored)
$(GPG) --dry-run --with-colon --import \
--import-options import-show $$pubkey_file 2> /dev/null |\
head -n 1 | cut -d: -f5)
MISSING_PUBKEY_FILES := $(sort \
$(foreach A,$(ARCHIVES),\