diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-11 11:15:40 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-13 13:49:39 +0100 |
| commit | ee28f213b63bff228bf2db0a585cac2d7c4edbfa (patch) | |
| tree | 55229bdcae9b4becc6ecab16be6c597854f75823 /morphlib/fsutils.py | |
| parent | d5cd1f19f6e166cdbbdb20692d1412e2b0b52876 (diff) | |
| download | morph-ee28f213b63bff228bf2db0a585cac2d7c4edbfa.tar.gz | |
morphlib: add 'arch' field to morphologies
This is an ugly, ugly way to do this, but time is pressing.
SystemBuilder checks what arch is defined in the morphology, if
it is an x86 (or None for compatibility) then it will do the syslinux
install stuff.
This hack is needed because syslinux is x86 specific and arm
often has different requirements for where the kernel must be loaded
from, sometimes it is flash, sometimes it is a different partition.
This will likely become board specific, but for a qemu-system-arm,
the kernel should be a separate file, to be passed on the command line.
Having a different 'kind' for each architecture would be a nicer way,
but would require more changes, since there are various checks for
morphology['kind'] == 'system'
Diffstat (limited to 'morphlib/fsutils.py')
| -rw-r--r-- | morphlib/fsutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/fsutils.py b/morphlib/fsutils.py index 770cafa8..c74e97db 100644 --- a/morphlib/fsutils.py +++ b/morphlib/fsutils.py @@ -26,7 +26,7 @@ def partition_image(runcmd, image_name): # FIXME make this more flexible with partitioning options runcmd(['sfdisk', image_name], feed_stdin='1,,83,*\n') -def install_mbr(runcmd, image_name): +def install_syslinux_mbr(runcmd, image_name): for path in ['/usr/lib/extlinux/mbr.bin', '/usr/share/syslinux/mbr.bin']: if os.path.exists(path): |