mirror of
https://github.com/drasko/codezero.git
synced 2026-01-14 20:03:16 +01:00
Revert "Building baremetal containers in build directory"
This reverts commit e2c2f1f2b1.
We need a cleaner solution
This commit is contained in:
@@ -83,16 +83,15 @@ def build_posix_container(config, projpaths, container):
|
||||
def build_default_container(config, projpaths, container):
|
||||
images = []
|
||||
cwd = os.getcwd()
|
||||
projdir = join(join(BUILDDIR, 'cont') + str(container.id), \
|
||||
container.name)
|
||||
projdir = join(join(PROJROOT, 'conts'), container.name)
|
||||
os.chdir(projdir)
|
||||
os.system("scons")
|
||||
os.path.walk(projdir, glob_by_walk, ['*.elf', images])
|
||||
|
||||
# Calculate and store size of pager
|
||||
pager_binary = join("cont" + str(container.id), container.name) + "/main.elf"
|
||||
pager_binary = "conts/" + container.name + "/main.elf"
|
||||
config.containers[container.id].pager_size = \
|
||||
conv_hex(elf_binary_size(join(BUILDDIR, pager_binary)))
|
||||
conv_hex(elf_binary_size(join(PROJROOT, pager_binary)))
|
||||
|
||||
container_packer = DefaultContainerPacker(container, images)
|
||||
return container_packer.pack_container(config)
|
||||
|
||||
Reference in New Issue
Block a user