diff options
author | Chris Johns <chrisj@rtems.org> | 2016-03-16 17:14:45 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-03-16 17:17:52 +1100 |
commit | 8f6fb61d53e0dab6c30c54b4c2794e865b23d3f4 (patch) | |
tree | fc672a472920bbe2fe93bc1436b7de8781cf5b18 | |
parent | sb: Do not expand the package name in a bset file. (diff) | |
download | rtems-source-builder-8f6fb61d53e0dab6c30c54b4c2794e865b23d3f4.tar.bz2 |
bare/devel/qemu: Fix the release URL logic and pkconfig python3 issues.
Closes #2645.
-rw-r--r-- | bare/config/bare-config.cfg | 2 | ||||
-rwxr-xr-x | source-builder/pkg-config | 5 | ||||
-rw-r--r-- | source-builder/sb/download.py | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/bare/config/bare-config.cfg b/bare/config/bare-config.cfg index 2633cd7..e042e47 100644 --- a/bare/config/bare-config.cfg +++ b/bare/config/bare-config.cfg @@ -5,7 +5,7 @@ # # The RTEMS http git URL. # -%define rtems_version 4.11 +%define rtems_version 4.12 %define rtems_http_git http://git.rtems.org %define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version} %define bare_binutils_patches %{rtems_git_tools}/binutils diff --git a/source-builder/pkg-config b/source-builder/pkg-config index d2afff0..a5dfba0 100755 --- a/source-builder/pkg-config +++ b/source-builder/pkg-config @@ -87,8 +87,9 @@ def log(s, lf = True): print(s, file = out) else: if out != sys.stdout and trace_stdout: - print(s, end = '', flush = True) - print(out, s, end = '', flush = True) + print(s, end = '') + sys.stdout.flush() + print(s, end = '', file = out) def run(argv): diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 355cd4a..bd6e6a6 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -561,9 +561,13 @@ def get_file(url, local, opts, config): # override the released check. # url_bases = opts.urls() - rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources') + try: + rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources') + except: + rtems_release_url_value = None + log.output('RTEMS release URL could not be expanded') rtems_release_url = None - if version.released(): + if version.released() and rtems_release_url_value: rtems_release_url = rtems_release_url_value with_rel_url = opts.with_arg('release-url') if with_rel_url[1] == 'not-found': @@ -571,6 +575,8 @@ def get_file(url, local, opts, config): with_rel_url = ('without_release-url', 'yes') if with_rel_url[0] == 'with_release-url': if with_rel_url[1] == 'yes': + if rtems_release_url_value is None: + raise error.general('no valid release URL') rtems_release_url = rtems_release_url_value elif with_rel_url[1] == 'no': pass |