mirror of
https://github.com/drasko/codezero.git
synced 2026-02-25 16:23:13 +01:00
Merge branch 'master' of git://www.b-labs.co.uk/bora/git/codezero into bora
Conflicts: config/cml/container_ruleset.template config/configuration.py conts/examples/example1/SConstruct conts/libl4thread/include/l4thread/thread.h
This commit is contained in:
@@ -4,7 +4,7 @@ import os, sys, shelve, shutil
|
||||
from os.path import join
|
||||
from config.projpaths import *
|
||||
from config.configuration import *
|
||||
from scripts.bare.bare_generator import *
|
||||
from scripts.examples.examples_generator import *
|
||||
from scripts.kernel.generate_kernel_cinfo import *
|
||||
from scripts.cml.generate_container_cml import *
|
||||
from optparse import OptionParser
|
||||
@@ -184,9 +184,9 @@ def configure_system(options, args):
|
||||
|
||||
configuration_save(config)
|
||||
|
||||
# Generate bare container files if new ones defined
|
||||
bare_cont_gen = BareContGenerator()
|
||||
bare_cont_gen.bare_container_generate(config)
|
||||
# Generate example container files if new ones defined
|
||||
examples_cont_gen = ExamplesContGenerator()
|
||||
examples_cont_gen.examples_container_generate(config)
|
||||
|
||||
# Print out the configuration if asked
|
||||
if options.print_config:
|
||||
|
||||
Reference in New Issue
Block a user