rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

bare/devel/qemu: Fix the release URL logic and pkconfig python3 issues.

Browse Source 
Closes #2645.
This commit is contained in:
Chris Johns 2016-03-16 17:14:45 +11:00
parent e70a165d6d
commit 8f6fb61d53
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bare/config/bare-config.cfg
View File

@ -5,7 +5,7 @@
# #
# The RTEMS http git URL. # 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_http_git http://git.rtems.org
%define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version} %define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
%define bare_binutils_patches %{rtems_git_tools}/binutils %define bare_binutils_patches %{rtems_git_tools}/binutils

5
source-builder/pkg-config
View File

@ -87,8 +87,9 @@ def log(s, lf = True):
print(s, file = out) print(s, file = out)
else: else:
if out != sys.stdout and trace_stdout: if out != sys.stdout and trace_stdout:
print(s, end = '', flush = True) print(s, end = '')
print(out, s, end = '', flush = True) sys.stdout.flush()
print(s, end = '', file = out)
def run(argv): def run(argv):

8
source-builder/sb/download.py
View File

@ -561,9 +561,13 @@ def get_file(url, local, opts, config):
# override the released check. # override the released check.
# #
url_bases = opts.urls() url_bases = opts.urls()
try:
rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources') 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 rtems_release_url = None
if version.released(): if version.released() and rtems_release_url_value:
rtems_release_url = rtems_release_url_value rtems_release_url = rtems_release_url_value
with_rel_url = opts.with_arg('release-url') with_rel_url = opts.with_arg('release-url')
if with_rel_url[1] == 'not-found': 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') with_rel_url = ('without_release-url', 'yes')
if with_rel_url[0] == 'with_release-url': if with_rel_url[0] == 'with_release-url':
if with_rel_url[1] == 'yes': 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 rtems_release_url = rtems_release_url_value
elif with_rel_url[1] == 'no': elif with_rel_url[1] == 'no':
pass pass