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

source-builder/sb/bootstrap.py: Do not reference bsp_specs to find BSPs

Browse Source 
Updates #3520.
This commit is contained in:
Joel Sherrill 2017-11-22 09:33:04 -06:00
parent d1e6dfcb1e
commit ea15753f14
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source-builder/sb/bootstrap.py
View File

@ -34,6 +34,14 @@ import options
import path import path
import version import version
def _collect_dirs(path_, dir):
confs = []
for root, dirs, files in os.walk(path.host(path_), topdown = True):
for f in dirs:
if f == dir:
confs += [path.shell(path.join(root, f))]
return confs
def _collect(path_, file): def _collect(path_, file):
confs = [] confs = []
for root, dirs, files in os.walk(path.host(path_), topdown = True): for root, dirs, files in os.walk(path.host(path_), topdown = True):
@ -130,7 +138,7 @@ class autoreconf:
def bspopts(self): def bspopts(self):
if _grep(self.configure, 'RTEMS_CHECK_BSPDIR'): if _grep(self.configure, 'RTEMS_CHECK_BSPDIR'):
bsp_specs = _collect(self.cwd, 'bsp_specs') bsps = _collect_dirs(self.cwd, 'custom')
try: try:
acinclude = path.join(self.cwd, 'acinclude.m4') acinclude = path.join(self.cwd, 'acinclude.m4')
b = open(path.host(acinclude), 'w') b = open(path.host(acinclude), 'w')
@ -138,8 +146,9 @@ class autoreconf:
b.write('AC_DEFUN([RTEMS_CHECK_BSPDIR],' + os.linesep) b.write('AC_DEFUN([RTEMS_CHECK_BSPDIR],' + os.linesep)
b.write('[' + os.linesep) b.write('[' + os.linesep)
b.write(' case "$1" in' + os.linesep) b.write(' case "$1" in' + os.linesep)
for bs in sorted(bsp_specs): for bs in sorted(bsps):
dir = path.dirname(bs)[len(self.cwd) + 1:] dir = path.dirname(bs)[len(self.cwd) + 1:]
dir = path.dirname(dir)
b.write(' %s )%s' % (dir, os.linesep)) b.write(' %s )%s' % (dir, os.linesep))
b.write(' AC_CONFIG_SUBDIRS([%s]);;%s' % (dir, os.linesep)) b.write(' AC_CONFIG_SUBDIRS([%s]);;%s' % (dir, os.linesep))
b.write(' *)' + os.linesep) b.write(' *)' + os.linesep)