mirror of
https://github.com/drasko/codezero.git
synced 2026-01-18 22:03:16 +01:00
Revert "Merge branch 'libl4thread' of git://www.b-labs.co.uk/bora/git/codezero into bora"
This reverts commit 3f870b540f.
This commit is contained in:
@@ -55,7 +55,7 @@ def source_to_builddir(srcdir, id):
|
||||
return join(BUILDDIR, cont_builddir)
|
||||
|
||||
# We simply use SCons to figure all this out from container.id
|
||||
# This is very similar to examples container builder:
|
||||
# This is very similar to default container builder:
|
||||
# In fact this notion may become a standard convention for
|
||||
# calling specific bare containers
|
||||
def build_posix_container(config, projpaths, container):
|
||||
@@ -110,7 +110,7 @@ def build_default_container(config, projpaths, container):
|
||||
os.path.walk(projdir, glob_by_walk, ['*.elf', images])
|
||||
|
||||
# Calculate and store size of pager
|
||||
pager_binary = "conts/" + container.name + "/main.elf"
|
||||
pager_binary = "conts/bare" + str(container.id) + "/main.elf"
|
||||
config.containers[container.id].pager_size = \
|
||||
conv_hex(elf_binary_size(join(PROJROOT, pager_binary)))
|
||||
|
||||
@@ -124,7 +124,7 @@ def build_all_containers():
|
||||
if container.type == 'linux':
|
||||
pass
|
||||
cont_images.append(build_linux_container(config, projpaths, container))
|
||||
elif container.type == 'examples':
|
||||
elif container.type == 'bare':
|
||||
cont_images.append(build_default_container(config, projpaths, container))
|
||||
elif container.type == 'posix':
|
||||
cont_images.append(build_posix_container(config, projpaths, container))
|
||||
|
||||
Reference in New Issue
Block a user