Changeset 8f6fb61 in rtems-source-builder


Ignore:
Timestamp:
Mar 16, 2016, 6:14:45 AM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11
Children:
4ffa1d4
Parents:
e70a165
git-author:
Chris Johns <chrisj@…> (03/16/16 06:14:45)
git-committer:
Chris Johns <chrisj@…> (03/16/16 06:17:52)
Message:

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

Closes #2645.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bare/config/bare-config.cfg

    re70a165 r8f6fb61  
    66# The RTEMS http git URL.
    77#
    8 %define rtems_version         4.11
     8%define rtems_version         4.12
    99%define rtems_http_git        http://git.rtems.org
    1010%define rtems_git_tools       %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
  • source-builder/pkg-config

    re70a165 r8f6fb61  
    8888        else:
    8989            if out != sys.stdout and trace_stdout:
    90                 print(s, end = '', flush = True)
    91             print(out, s, end = '', flush = True)
     90                print(s, end = '')
     91                sys.stdout.flush()
     92            print(s, end = '', file = out)
    9293
    9394def run(argv):
  • source-builder/sb/download.py

    re70a165 r8f6fb61  
    562562    #
    563563    url_bases = opts.urls()
    564     rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources')
     564    try:
     565        rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources')
     566    except:
     567        rtems_release_url_value = None
     568        log.output('RTEMS release URL could not be expanded')
    565569    rtems_release_url = None
    566     if version.released():
     570    if version.released() and rtems_release_url_value:
    567571        rtems_release_url = rtems_release_url_value
    568572    with_rel_url = opts.with_arg('release-url')
     
    572576    if with_rel_url[0] == 'with_release-url':
    573577        if with_rel_url[1] == 'yes':
     578            if rtems_release_url_value is None:
     579                raise error.general('no valid release URL')
    574580            rtems_release_url = rtems_release_url_value
    575581        elif with_rel_url[1] == 'no':
Note: See TracChangeset for help on using the changeset viewer.