rootfs: don't use fakeroot
authorTimo Savola <tsavola@movial.fi>
Mon, 21 Jul 2008 15:50:03 +0000 (18:50 +0300)
committerTimo Savola <tsavola@movial.fi>
Mon, 21 Jul 2008 15:50:03 +0000 (18:50 +0300)
faked has problems with database saving/loading; run matrix-rootfs inside
fakeroot for now (until fakedbs are really being used).

matrix/rootfs.py

index dfebc10..9ba2148 100644 (file)
@@ -106,13 +106,13 @@ class Builder(object):
 
        # Tools
        strip = "strip"
-       mknod = "fakeroot -i /tmp/env.faked -s /tmp/env.faked mknod"
-       chmod = "fakeroot -i /tmp/env.faked -s /tmp/env.faked chmod"
-       chown = "fakeroot -i /tmp/env.faked -s /tmp/env.faked chown"
-       mkfs_jffs2 = "fakeroot -i /tmp/env.faked -s /tmp/env.faked mkfs.jffs2"
-       mkfs_ubifs = "fakeroot -i /tmp/env.faked -s /tmp/env.faked mkfs.ubifs"
-       ubinize = "fakeroot -i /tmp/env.faked -s /tmp/env.faked ubinize"
-       tar = "fakeroot -i /tmp/env.faked -s /tmp/env.faked tar"
+       mknod = "mknod"
+       chmod = "chmod"
+       chown = "chown"
+       mkfs_jffs2 = "mkfs.jffs2"
+       mkfs_ubifs = "mkfs.ubifs"
+       ubinize = "ubinize"
+       tar = "tar"
        flash_erase_size = 0x4000
        flash_pad_size = 0x3e00000
        # Compression to use
@@ -278,10 +278,10 @@ class Builder(object):
 
                        if os.path.islink(f):
                                link_dest = os.readlink(f)
-                               os.symlink(link_dest, os.path.join(self.builddir, self.target, f))
+                               os.symlink(link_dest, os.path.join(basepath, f))
                        elif os.path.isdir(f):
                                try:
-                                       os.makedirs(os.path.join(self.builddir, self.target, f))
+                                       os.makedirs(os.path.join(basepath, f))
                                except OSError, e:
                                        if e.errno == errno.EEXIST:
                                                pass