From d91a0d2dc678afe8a2c696077f0640e6874f52bc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 31 Dec 2009 16:31:11 +0100 Subject: [PATCH] maint.mk: don't require explicit gpg_key_ID in cfg.mk * top/maint.mk (gpg_key_ID): Derive key ID from signed release tag. With this change, we can all remove the gpg_key_ID = ... definition from our respective cfg.mk files. --- ChangeLog | 5 +++++ top/maint.mk | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ada6051b5d..d5ff55f30c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-12-31 Jim Meyering + maint.mk: don't require explicit gpg_key_ID in cfg.mk + * top/maint.mk (gpg_key_ID): Derive key ID from signed release tag. + With this change, we can all remove the gpg_key_ID = ... definition + from our respective cfg.mk files. + maint.mk: create announcement template in ~/, not in /tmp * top/maint.mk (emit_upload_commands): Adjust. (release-prep): Emit into ~/announce-..., not /tmp/announce-... diff --git a/top/maint.mk b/top/maint.mk index 2d25535db0..b90d2fe5d3 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -30,7 +30,6 @@ gzip_rsyncable := \ $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable) GZIP_ENV = '--no-name --best $(gzip_rsyncable)' -# cfg.mk must define the gpg_key_ID used by this package. GIT = git VC = $(GIT) VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)' @@ -688,6 +687,13 @@ gnulib_dir ?= $(srcdir)/gnulib gnulib-version = $$(cd $(gnulib_dir) && git describe) bootstrap-tools ?= autoconf,automake,gnulib +# If it's not already specified, derive the GPG key ID from +# the signed tag we've just applied to mark this release. +gpg_key_ID ?= \ + $$(git cat-file tag v$(VERSION) > .ann-sig \ + && gpgv .ann-sig - < /dev/null 2>&1 \ + | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig) + announcement: NEWS ChangeLog $(rel-files) @$(build_aux)/announce-gen \ --release-type=$(RELEASE_TYPE) \ -- 2.30.2