From ea15753f14ff255d69b26c6636ed4ac3d3060011 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 22 Nov 2017 09:33:04 -0600 Subject: source-builder/sb/bootstrap.py: Do not reference bsp_specs to find BSPs Updates #3520. --- source-builder/sb/bootstrap.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source-builder/sb/bootstrap.py b/source-builder/sb/bootstrap.py index 9095f3c..d78cfdc 100644 --- a/source-builder/sb/bootstrap.py +++ b/source-builder/sb/bootstrap.py @@ -34,6 +34,14 @@ import options import path 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): confs = [] for root, dirs, files in os.walk(path.host(path_), topdown = True): @@ -130,7 +138,7 @@ class autoreconf: def bspopts(self): if _grep(self.configure, 'RTEMS_CHECK_BSPDIR'): - bsp_specs = _collect(self.cwd, 'bsp_specs') + bsps = _collect_dirs(self.cwd, 'custom') try: acinclude = path.join(self.cwd, 'acinclude.m4') b = open(path.host(acinclude), 'w') @@ -138,8 +146,9 @@ class autoreconf: b.write('AC_DEFUN([RTEMS_CHECK_BSPDIR],' + os.linesep) b.write('[' + 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(dir) b.write(' %s )%s' % (dir, os.linesep)) b.write(' AC_CONFIG_SUBDIRS([%s]);;%s' % (dir, os.linesep)) b.write(' *)' + os.linesep) -- cgit v1.2.3