mirror of
https://github.com/drasko/codezero.git
synced 2026-03-01 10:13:14 +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:
@@ -12,6 +12,7 @@ class Container:
|
||||
self.name = None
|
||||
self.type = None
|
||||
self.id = id
|
||||
self.example_id = 0
|
||||
self.pager_lma = 0
|
||||
self.pager_vma = 0
|
||||
self.pager_size = 0
|
||||
@@ -172,6 +173,9 @@ class configuration:
|
||||
dirname = val[1:-1].lower()
|
||||
self.containers[id].dirname = dirname
|
||||
self.containers[id].name = dirname
|
||||
elif param[:len("EXAMPLE_APP")] == "EXAMPLE_APP":
|
||||
param1 = param.split("_", 1)
|
||||
self.containers[id].example_id = param1[1][-1:]
|
||||
elif param[:len("CAP_")] == "CAP_":
|
||||
prefix, param_rest = param.split('_', 1)
|
||||
prepare_capability(self.containers[id], param_rest, val)
|
||||
@@ -182,11 +186,10 @@ class configuration:
|
||||
self.containers[id].type = "linux"
|
||||
elif param2 == "POSIX":
|
||||
self.containers[id].type = "posix"
|
||||
elif param2 == "BARE":
|
||||
self.containers[id].type = "bare"
|
||||
elif param2 == "EXAMPLES":
|
||||
self.containers[id].type = "examples"
|
||||
elif param2 == "TEST":
|
||||
self.containers[id].type = "test"
|
||||
|
||||
# Extract parameters for containers
|
||||
def get_container_parameters(self, name, val):
|
||||
matchobj = re.match(r"(CONFIG_CONT){1}([0-9]){1}(\w+)", name)
|
||||
|
||||
Reference in New Issue
Block a user