summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-30 20:50:37 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-30 20:53:23 (EDT)
commit722cb9aeeffd098a9d4060fc864f23278a5b06e9 (patch)
tree6f5640abeaea3a35e36edbd3758553b278812b8f
parentc136e175edae9febd66fcab92b5e84a3e1809169 (diff)
source.mk: Remove embedded copy of zlib
-rw-r--r--changelog4
-rw-r--r--source.mk14
2 files changed, 13 insertions, 5 deletions
diff --git a/changelog b/changelog
index 8dbc527..e7961cd 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-binutils (2.32-1) trunk
+binutils (2.32+sip1-1) trunk
* New upstream version.
* Update Maintainer field.
@@ -6,6 +6,8 @@ binutils (2.32-1) trunk
upstream.
* patches/03_ld-fix-tests-on-busybox-ash.patch: Drop patch (code
removed upstream).
+ * Remove embedded copy of zlib (contains non-free IETC RFCs and isn't
+ needed anyway).
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Tue, 30 Apr 2019 15:10:59 -0400
diff --git a/source.mk b/source.mk
index ee7edc4..8d98fcb 100644
--- a/source.mk
+++ b/source.mk
@@ -1,4 +1,6 @@
-upstream_archive = binutils-$(OPK_SOURCE_VERSION_UPSTREAM).tar.xz
+upstream_ver = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \
+ sed 's/+sip[1-9][0-9]*.*$$//')
+upstream_archive = binutils-$(upstream_ver).tar.xz
upstream_url = http://ftp.gnu.org/pub/gnu/binutils/$(upstream_archive)
source_archive = ../binutils-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.xz
@@ -7,17 +9,21 @@ keys = \
'3A24 BC1E 8FB4 09FA 9F14 3718 13FC EF89 DD9E 3C4F'
$(source_archive):
- wget -c '$(upstream_url)' '$(upstream_url).sig'
+ wget -c "$(upstream_url)" "$(upstream_url).sig"
install -m 0700 -d gnupghome/
[ -e ../keyring.gpg ] || \
$(gpg) --keyserver hkp://pool.sks-keyservers.net \
--recv-keys $(keys); \
rm -f ../keyring.gpg~; \
- if ! $(gpg) --verify '$(upstream_archive).sig'; then \
+ if ! $(gpg) --verify "$(upstream_archive).sig"; then \
rm -Rf gnupghome/; \
exit 1; \
fi
rm -Rf gnupghome/
- mv '$(upstream_archive)' '$(source_archive)'
+ tar -xJf "$(upstream_archive)"
+ rm -Rf "binutils-$(upstream_ver)/zlib/"
+ tar -cJf '$(source_archive)' "binutils-$(upstream_ver)/"
+ rm -Rf src/
+ mv "binutils-$(upstream_ver)/" src/
source: $(source_archive)