finish board attribute changes
authorTimo Savola <tsavola@movial.fi>
Tue, 29 Apr 2008 20:25:04 +0000 (23:25 +0300)
committerTimo Savola <tsavola@movial.fi>
Tue, 29 Apr 2008 20:25:04 +0000 (23:25 +0300)
matrix/config.py
matrix/rootfs.py

index afc7e99..45d1c82 100644 (file)
@@ -15,10 +15,10 @@ class Board(object):
                self.name = name
                self.arch = arch
                self.gcc_march = gcc_march
-               self.gcc_mcpu = gcc_mcpu
-               self.gcc_mfpu = gcc_mfpu
-               self.gcc_options = gcc_options
-               self.gnu_host = gnu_host
+               self.gcc_mcpu = gcc_mcpu or ''
+               self.gcc_mfpu = gcc_mfpu or ''
+               self.gcc_options = gcc_options or ''
+               self.gnu_host = gnu_host or ''
                self.flash_erase_size = flash_erase_size
                self.flash_pad_size = flash_pad_size
 
index b19be2e..fe1a287 100644 (file)
@@ -92,8 +92,8 @@ class Builder(object):
        chown = "fakeroot -i /tmp/env.faked -s /tmp/env.faked chown"
        mkfs = "fakeroot -i /tmp/env.faked -s /tmp/env.faked mkfs.jffs2"
        tar = "fakeroot -i /tmp/env.faked -s /tmp/env.faked tar"
-       flash_erase_size = "0x4000"
-       flash_pad_size = "0x3e00000"
+       flash_erase_size = 0x4000
+       flash_pad_size = 0x3e00000
 
        file_list = []
        remove_list = []
@@ -277,7 +277,7 @@ class Builder(object):
                        os.system("%s -c --one-file-system -C %s/%s -z -f %s/%s.tgz ." % (self.tar, self.builddir, self.target, self.builddir, self.target))
                if build_target is "all" or build_target is "jffs2":
                        print "Creating a root image..."
-                       os.system("%s -p%s -n -e%s -r %s/%s -o %s/%s.jffs2" % (self.mkfs, self.flash_pad_size, self.flash_erase_size, self.builddir, self.target, self.builddir, self.target))
+                       os.system("%s -p%d -n -e%d -r %s/%s -o %s/%s.jffs2" % (self.mkfs, self.flash_pad_size, self.flash_erase_size, self.builddir, self.target, self.builddir, self.target))
                if build_target is "all" or build_target is "devrootfs":
                        print "Creating a rootstrap..."
                        os.system("%s -c --one-file-system -C /targets/%s -z -f %s/%s-rootstrap.tgz ." % ("tar", self.target, self.builddir, self.target))