summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-03-05 08:29:40 +1100
committerChris Johns <chrisj@rtems.org>2018-03-05 08:29:40 +1100
commit4b3e0f8e3d6998b84a2503dd2e11578989b1672b (patch)
tree6575ba11215fcbf304c5065fbf1042074eee2d16
parentsb: Convert any unicode keys to strings (diff)
downloadrtems-source-builder-4b3e0f8e3d6998b84a2503dd2e11578989b1672b.tar.bz2
The libexpat project has moved to github. Fetch expat from github.
Close #3315
-rw-r--r--bare/config/devel/expat-2.1.0-1.cfg3
-rw-r--r--source-builder/config/expat-2-1.cfg2
-rw-r--r--source-builder/sb/download.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/bare/config/devel/expat-2.1.0-1.cfg b/bare/config/devel/expat-2.1.0-1.cfg
index ca3f64f..90f2ce8 100644
--- a/bare/config/devel/expat-2.1.0-1.cfg
+++ b/bare/config/devel/expat-2.1.0-1.cfg
@@ -8,7 +8,8 @@
%include %{_configdir}/base.cfg
-%define expat_version 2.1.0
+%define expat_version 2.1.0
+%define expat_version_dir R_2_1_0
%hash sha256 expat-%{expat_version}.tar.gz 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
diff --git a/source-builder/config/expat-2-1.cfg b/source-builder/config/expat-2-1.cfg
index 589bc86..77774e7 100644
--- a/source-builder/config/expat-2-1.cfg
+++ b/source-builder/config/expat-2-1.cfg
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source
#
-%source set expat http://downloads.sourceforge.net/project/expat/expat/%{expat_version}/expat-%{expat_version}.tar.gz
+%source set expat https://github.com/libexpat/libexpat/releases/download/%{expat_version_dir}/expat-%{expat_version}.tar.gz
#
# Prepare the source code.
diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py
index 0316e59..d8061e6 100644
--- a/source-builder/sb/download.py
+++ b/source-builder/sb/download.py
@@ -71,7 +71,7 @@ def _humanize_bytes(bytes, precision = 1):
return '%.*f%s' % (precision, float(bytes) / factor, suffix)
def _sensible_url(url, used = 0):
- space = 200
+ space = 100
if len(url) > space:
size = int(space - 14)
url = url[:size] + '...<see log>'