Changeset e801762 in rtems-tools


Ignore:
Timestamp:
Aug 4, 2012, 12:17:33 PM (7 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
5a44122
Parents:
db789e3
Message:

Use the crossrpms repo and not the RTEMS source.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • specbuilder/specbuilder/setup.py

    rdb789e3 re801762  
    9898    def check_version(self, cmd, macro):
    9999        vcmd = cmd + ' --version'
    100         vcmd = self.opts.expand('%{___setup_shell} -e ' + vcmd, self.defaults)       
     100        vcmd = self.opts.expand('%{___setup_shell} -e ' + vcmd, self.defaults)
    101101        e = execute.capture_execution()
    102102        exit_code, proc, output = e.shell(vcmd)
     
    142142    def build_crossrpms(self, path):
    143143        if 'rtems' in self.opts.opts:
    144             rtemssrc = os.path.abspath(os.path.expanduser(self.opts.opts['rtems']))
    145             crossrpms = os.path.join(rtemssrc, 'contrib', 'crossrpms')
     144            crossrpms = os.path.abspath(os.path.expanduser(self.opts.opts['rtems']))
    146145            if not os.path.isdir(crossrpms):
    147                 crossrpms = os.path.join(rtemssrc)
    148                 if not os.path.isdir(crossrpms):
    149                     raise error.general('no crossrpms directory found under: ' + crossrpms)
     146                raise error.general('no crossrpms directory found under: ' + crossrpms)
    150147            if self.opts.rebuild():
    151148                if self.check_version('autoconf', '%{__setup_autoconf}'):
     
    155152            self._install_files(self.get_specs(crossrpms), os.path.join(path, 'SPECS'))
    156153            self._install_files(self.get_patches(crossrpms), os.path.join(path, 'SOURCES'))
    157  
     154
    158155def run():
    159156    import sys
Note: See TracChangeset for help on using the changeset viewer.