summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-07 19:49:32 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-07 19:49:32 (EDT)
commita1ba1c9502a66cb60c64035d44fe89f89046ac87 (patch)
treeb3ea6dd84b52d7b90bac6adfd17ff76814164263
parent2975c279bb3fa512082c2a786bf9a4e467ad2860 (diff)
source.mk: Fix/update
-rw-r--r--source.mk18
1 files changed, 10 insertions, 8 deletions
diff --git a/source.mk b/source.mk
index a9117a3..ee99fc2 100644
--- a/source.mk
+++ b/source.mk
@@ -1,21 +1,23 @@
-upstream_archive = $(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
+upstream_version = $$(printf '%s\n' $(OPK_SOURCE_VERSION_UPSTREAM) | \
+ sed 's/+.*//')
+upstream_archive = $(OPK_SOURCE)-$(upstream_version).tar.gz
upstream_url = http://ftp.gnu.org/gnu/$(OPK_SOURCE)/$(upstream_archive)
source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
keys = \
- '6CEF 9231 D6BF 2594 FABA 779E F7E8 72FE B971 54D3' \
- '7768 CE4B 75E5 236F 1A37 4CEE C4C9 27CD 5D1B 36D7' \
- '155D 3FC5 00C8 3448 6D1E EA67 7FD9 FCCB 000B EEEE'
+ '259B 3792 B3D6 D319 212C C4DC D5BF 9FEB 0313 653A'
$(source_archive):
- wget -c '$(upstream_url)'
+ wget -c "$(upstream_url)"
set -e; if gpg --version >/dev/null 2>&1; then \
- wget -c '$(upstream_url).sig'; \
+ wget -c "$(upstream_url).sig"; \
[ -e ../keyring.gpg ] || \
gpg --keyring ../keyring.gpg --no-default-keyring \
+ --keyserver hkp://pool.sks-keyservers.net \
--recv-keys $(keys) || true; \
+ rm -f ../keyring.gpg~; \
gpg --verify --keyring ../keyring.gpg \
- '$(upstream_archive).sig'; \
+ "$(upstream_archive).sig"; \
fi
- mv '$(upstream_archive)' '$(source_archive)'
+ mv "$(upstream_archive)" '$(source_archive)'
source: $(source_archive)