Changeset c0d52d5 in rtems_waf


Ignore:
Timestamp:
Aug 12, 2018, 1:57:31 AM (2 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
945b0b9c069959266c698eeda51cedd2a055b9fe
Children:
112ce92
Parents:
656b7b0
Message:

Change RTEMS path check from bin to share/rtems<version>.

There is no bin directory anymore with RTEMS 5 so the test fails. Check
for the share/rtems<version> directory.

Closes #3500.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • rtems.py

    r656b7b0 rc0d52d5  
    105105        # Check the tools, architectures and bsps.
    106106        #
    107         rtems_version, rtems_path, rtems_bin, rtems_tools, archs, arch_bsps = \
     107        rtems_version, rtems_path, rtems_tools, archs, arch_bsps = \
    108108            check_options(ctx,
    109109                          env.options['prefix'],
     
    166166        long_commands = 'no'
    167167
    168     rtems_version, rtems_path, rtems_bin, rtems_tools, archs, arch_bsps = \
     168    rtems_version, rtems_path, rtems_tools, archs, arch_bsps = \
    169169        check_options(conf,
    170170                      conf.options.prefix,
     
    212212        conf.env.RTEMS_BSP = bsp
    213213
    214         tools = _find_tools(conf, arch, [rtems_bin] + rtems_tools, tools)
     214        tools = _find_tools(conf, arch, rtems_tools, tools)
    215215        for t in tools[arch]:
    216216            conf.env[t] = tools[arch][t]
     
    378378    else:
    379379        ctx.fatal('RTEMS path is not valid. No lib/pkgconfig or rtems-config found.')
    380     if os.path.exists(os.path.join(rtems_path, 'bin')):
    381         rtems_bin = os.path.join(rtems_path, 'bin')
    382     else:
    383         ctx.fatal('RTEMS path is not valid. No bin directory found.')
     380    rtems_share_rtems_version = os.path.join(rtems_path, 'share', 'rtems' + rtems_version)
     381    if not os.path.exists(os.path.join(rtems_share_rtems_version)):
     382        ctx.fatal('RTEMS path is not valid, "%s" not found.' % (rtems_share_rtems_version))
    384383
    385384    #
     
    438437    arch_bsps = filter(ctx, 'bsps', arch_bsps)
    439438
    440     return rtems_version, rtems_path, rtems_bin, tools, archs, arch_bsps
     439    return rtems_version, rtems_path, tools, archs, arch_bsps
    441440
    442441def check_env(ctx, var):
Note: See TracChangeset for help on using the changeset viewer.