Marcel Telka
2024-04-08 5d8bcb58722b250c296fc0324f9d06470fb3d7d0
tools/bass-o-matic
@@ -1,4 +1,4 @@
#!/usr/bin/python3.5
#!/usr/bin/python3.9
#
# CDDL HEADER START
#
@@ -118,7 +118,7 @@
            # Only 'openindiana' category.
            category = line.split('/')[0]
            if category is 'openindiana':
            if category == 'openindiana':
                continue
            filename = os.path.basename(line)
@@ -131,10 +131,10 @@
        # Add meta-packages/history only if we build the main repository, where
        # subdir is equal to 'components'.
        if subdir is 'components':
        if subdir == 'components':
            paths.append('meta-packages/history')
        # Add encumbered/meta-packages/history only if we build the encumbered repository
        if subdir is 'components/encumbered':
        if subdir == 'components/encumbered':
            paths.append('encumbered/meta-packages/history')
        paths = list(set(paths))
@@ -192,7 +192,17 @@
                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',)
    if make_arg:
        proc = subprocess.Popen(['gmake', '-s'] + [make_arg])
        MAKE=os.getenv("MAKE","gmake")
        # https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html
        JOBFLAGS=re.match('.* (--jobserver-auth=([0-9]+),([0-9]+)) ?.*',os.getenv("MAKEFLAGS",""))
        if JOBFLAGS:
            JOBFDS=( JOBFLAGS.group(2), JOBFLAGS.group(3) )
            JOBFLAGS=[JOBFLAGS.group(1)]
        else:
            JOBFDS=()
            JOBFLAGS=[]
        proc = subprocess.Popen([MAKE, '-s'] + [make_arg] + JOBFLAGS,pass_fds=JOBFDS)
        rc = proc.wait()
        sys.exit(rc)