mirror of
https://github.com/drasko/codezero.git
synced 2026-01-24 16:53:14 +01:00
Changes since April
Clean up of build directories. Simplifications to capability model.
This commit is contained in:
Bahadir Balban
@@ -11,44 +11,41 @@ from tools.pyelf.elfsize import *
|
||||
from tools.pyelf.elf_section_info import *
|
||||
|
||||
PROJRELROOT = '../../'
|
||||
|
||||
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), PROJRELROOT)))
|
||||
sys.path.append(os.path.abspath("../"))
|
||||
|
||||
from config.projpaths import *
|
||||
from config.configuration import *
|
||||
from scripts.config.projpaths import *
|
||||
from scripts.config.configuration import *
|
||||
from scripts.linux.build_linux import *
|
||||
from scripts.linux.build_rootfs import *
|
||||
from scripts.linux.build_atags import *
|
||||
from pack import *
|
||||
from packall import *
|
||||
from scripts.baremetal.baremetal_generator import *
|
||||
|
||||
def fill_pager_section_markers(cont, pager_binary):
|
||||
cont.pager_rw_section_start, cont.pager_rw_section_end, \
|
||||
cont.pager_rx_section_start, cont.pager_rx_section_end = \
|
||||
elf_loadable_section_info(join(PROJROOT, pager_binary))
|
||||
cont.pager_rw_pheader_start, cont.pager_rw_pheader_end, \
|
||||
cont.pager_rx_pheader_start, cont.pager_rx_pheader_end = \
|
||||
elf_loadable_section_info(join(PROJROOT, pager_binary))
|
||||
|
||||
def build_linux_container(config, projpaths, container):
|
||||
linux_builder = LinuxBuilder(projpaths, container)
|
||||
linux_builder.build_linux(config)
|
||||
def build_linux_container(config, projpaths, container, opts):
|
||||
linux_builder = LinuxBuilder(projpaths, container, opts)
|
||||
linux_builder.build_linux(config, opts)
|
||||
|
||||
rootfs_builder = RootfsBuilder(projpaths, container)
|
||||
rootfs_builder.build_rootfs(config)
|
||||
atags_builder = AtagsBuilder(projpaths, container)
|
||||
atags_builder.build_atags(config)
|
||||
os.chdir(LINUX_ROOTFSDIR)
|
||||
os.system('scons cid=' + str(container.id))
|
||||
|
||||
os.chdir(LINUX_ATAGSDIR)
|
||||
os.system('scons cid=' + str(container.id))
|
||||
|
||||
# Calculate and store size of pager
|
||||
pager_binary = \
|
||||
join(BUILDDIR, "cont" + str(container.id) +
|
||||
"/linux/linux-2.6.33/linux.elf")
|
||||
"/linux/kernel-2.6.34/linux.elf")
|
||||
config.containers[container.id].pager_size = \
|
||||
conv_hex(elf_binary_size(pager_binary))
|
||||
|
||||
fill_pager_section_markers(config.containers[container.id], pager_binary)
|
||||
|
||||
linux_container_packer = \
|
||||
LinuxContainerPacker(container, linux_builder, \
|
||||
rootfs_builder, atags_builder)
|
||||
linux_container_packer = LinuxContainerPacker(container, linux_builder)
|
||||
return linux_container_packer.pack_container(config)
|
||||
|
||||
def glob_by_walk(arg, dirname, names):
|
||||
@@ -67,12 +64,12 @@ def source_to_builddir(srcdir, id):
|
||||
# This is very similar to examples container builder:
|
||||
# In fact this notion may become a standard convention for
|
||||
# calling specific bare containers
|
||||
def build_posix_container(config, projpaths, container):
|
||||
def build_posix_container(config, projpaths, container, opts):
|
||||
images = []
|
||||
cwd = os.getcwd()
|
||||
os.chdir(POSIXDIR)
|
||||
print '\nBuilding Posix Container %d...' % container.id
|
||||
scons_cmd = 'scons ' + 'cont=' + str(container.id)
|
||||
scons_cmd = 'scons ' + 'cont=' + str(container.id) + ' -j ' + opts.jobs
|
||||
#print "Issuing scons command: %s" % scons_cmd
|
||||
os.system(scons_cmd)
|
||||
builddir = source_to_builddir(POSIXDIR, container.id)
|
||||
@@ -93,16 +90,27 @@ def build_posix_container(config, projpaths, container):
|
||||
# This simply calls SCons on a given container, and collects
|
||||
# all images with .elf extension, instead of using whole classes
|
||||
# for building and packing.
|
||||
def build_default_container(config, projpaths, container):
|
||||
def build_default_container(config, projpaths, container, opts):
|
||||
images = []
|
||||
cwd = os.getcwd()
|
||||
projdir = join(join(PROJROOT, 'conts'), container.name)
|
||||
|
||||
builddir = join(join(BUILDDIR, 'cont') + str(container.id), container.name)
|
||||
if container.duplicate == 0:
|
||||
projdir = join(join(PROJROOT, 'conts/baremetal'), container.dirname)
|
||||
else:
|
||||
projdir = join(join(PROJROOT, 'conts'), container.name)
|
||||
|
||||
BaremetalContGenerator().baremetal_container_generate(config)
|
||||
|
||||
if not os.path.exists(builddir):
|
||||
os.mkdir(builddir)
|
||||
|
||||
os.chdir(projdir)
|
||||
os.system("scons")
|
||||
os.path.walk(projdir, glob_by_walk, ['*.elf', images])
|
||||
os.system("scons -j " + opts.jobs + " cid=" + str(container.id))
|
||||
os.path.walk(builddir, glob_by_walk, ['*.elf', images])
|
||||
|
||||
# Calculate and store size of pager
|
||||
pager_binary = join(PROJROOT, "conts/" + container.name + "/main.elf")
|
||||
pager_binary = join(builddir, "main.elf")
|
||||
config.containers[container.id].pager_size = \
|
||||
conv_hex(elf_binary_size(pager_binary))
|
||||
|
||||
@@ -111,17 +119,16 @@ def build_default_container(config, projpaths, container):
|
||||
container_packer = DefaultContainerPacker(container, images)
|
||||
return container_packer.pack_container(config)
|
||||
|
||||
def build_all_containers():
|
||||
def build_all_containers(opts):
|
||||
config = configuration_retrieve()
|
||||
cont_images = []
|
||||
for container in config.containers:
|
||||
if container.type == 'linux':
|
||||
pass
|
||||
cont_images.append(build_linux_container(config, projpaths, container))
|
||||
cont_images.append(build_linux_container(config, projpaths, container, opts))
|
||||
elif container.type == 'baremetal':
|
||||
cont_images.append(build_default_container(config, projpaths, container))
|
||||
cont_images.append(build_default_container(config, projpaths, container, opts))
|
||||
elif container.type == 'posix':
|
||||
cont_images.append(build_posix_container(config, projpaths, container))
|
||||
cont_images.append(build_posix_container(config, projpaths, container, opts))
|
||||
else:
|
||||
print "Error: Don't know how to build " + \
|
||||
"container of type: %s" % (container.type)
|
||||
@@ -131,6 +138,56 @@ def build_all_containers():
|
||||
|
||||
return all_cont_packer.pack_all(config)
|
||||
|
||||
# Clean containers
|
||||
def clean_all_containers():
|
||||
config = configuration_retrieve()
|
||||
for container in config.containers:
|
||||
if container.type == 'linux':
|
||||
linux_builder = LinuxBuilder(projpaths, container, None)
|
||||
linux_builder.clean(config)
|
||||
|
||||
os.chdir(LINUX_ROOTFSDIR)
|
||||
os.system('scons -c cid=' + str(container.id))
|
||||
os.chdir(LINUX_ATAGSDIR)
|
||||
os.system('scons -c cid=' + str(container.id))
|
||||
LinuxContainerPacker(container, linux_builder).clean()
|
||||
|
||||
elif container.type == 'baremetal':
|
||||
builddir = join(join(BUILDDIR, 'cont') + str(container.id), container.name)
|
||||
if container.duplicate == 0:
|
||||
projdir = join(join(PROJROOT, 'conts/baremetal'), container.dirname)
|
||||
else:
|
||||
projdir = join(join(PROJROOT, 'conts'), container.name)
|
||||
|
||||
os.chdir(projdir)
|
||||
os.system("scons -c cid=" + str(container.id))
|
||||
BaremetalContGenerator().baremetal_del_dynamic_files(container)
|
||||
DefaultContainerPacker(container, None).clean()
|
||||
|
||||
elif container.type == 'posix':
|
||||
os.chdir(POSIXDIR)
|
||||
scons_cmd = 'scons -c ' + 'cont=' + str(container.id)
|
||||
os.system(scons_cmd)
|
||||
DefaultContainerPacker(container, None).clean()
|
||||
|
||||
else:
|
||||
print "Error: Don't know how to build " + \
|
||||
"container of type: %s" % (container.type)
|
||||
exit(1)
|
||||
|
||||
# Clean packed containers elf
|
||||
all_cont_packer = AllContainerPacker(None, None)
|
||||
all_cont_packer.clean()
|
||||
|
||||
return None
|
||||
|
||||
def find_container_from_cid(cid):
|
||||
config = configuration_retrieve()
|
||||
for container in config.containers:
|
||||
if cid == container.id:
|
||||
return container
|
||||
return None
|
||||
|
||||
if __name__ == "__main__":
|
||||
build_all_containers()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user