summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-07-19 10:45:03 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-07-19 10:45:29 -0400
commit9f2356b34595b9663c1b25674607d0c981461f2b (patch)
tree8fad24e8e5449f4ef787510a3e4f8d4c56c99cfe
parentf6e76963e75f29c6f18397e3606799416d43b6f2 (diff)
[parabola-hackers]: allow specifying keyserver via command-lineHEADmaster
-rwxr-xr-xbin/pacman-make-keyring7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/pacman-make-keyring b/bin/pacman-make-keyring
index 8005ef5..9b1109c 100755
--- a/bin/pacman-make-keyring
+++ b/bin/pacman-make-keyring
@@ -21,12 +21,15 @@ ifeq ($(origin V),undefined)
$(info Usage: pacman-make-keyring V=$$(date -u +%Y%m%d))
$(error You must set V= on the command line)
endif
+ifeq ($(origin keyserver),undefined)
+keyserver = hkp://pgp.cyberbits.eu:11371
+endif
bin := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
yamldir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['yamldir']")
cachedir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['keyring_cachedir']")
-
outputdir = $(cachedir)/$(KEYRING_NAME)-keyring-$(V)
+
KEYRING_NAME = parabola
all: $(KEYRING_NAME)-keyring-$(V).tar.gz
@@ -110,7 +113,7 @@ $(cachedir)/deps.mk: ${users} $(var)outputdir $(var)cachedir $(var)KEYRING_NAME|
export LANG=C
-KEYSERVER = hkp://hkps.pool.sks-keyservers.net
+KEYSERVER = ${keyserver}
GPG = gpg --quiet --batch --no-tty --no-permission-warning --keyserver ${KEYSERVER} --homedir $(cachedir)/gpghome