Merge branch 'linux' of ssh://www.b-labs.co.uk/git/codezero into linux

This commit is contained in:
Bahadir Balban
2009-09-21 14:25:48 +03:00
2 changed files with 1 additions and 5 deletions

View File

@@ -1,4 +0,0 @@
.align 4
.section .data
.incbin "rootfs.img"

View File

@@ -58,7 +58,7 @@ def build_all_containers():
for container in config.containers:
if container.type == 'linux':
pass
#cont_images.append(build_linux_container(projpaths, container))
cont_images.append(build_linux_container(projpaths, container))
elif container.type == 'bare':
cont_images.append(build_default_container(projpaths, container))
else: