diff options
Diffstat (limited to 'scripts/lib/wic/partition.py')
| -rw-r--r-- | scripts/lib/wic/partition.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 85eb15c8b8..ebe250b00d 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py | |||
| @@ -199,21 +199,23 @@ class Partition(): | |||
| 199 | 199 | ||
| 200 | Currently handles ext2/3/4, btrfs, vfat and squashfs. | 200 | Currently handles ext2/3/4, btrfs, vfat and squashfs. |
| 201 | """ | 201 | """ |
| 202 | |||
| 203 | rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, | ||
| 204 | self.lineno, self.fstype) | ||
| 205 | if os.path.isfile(rootfs): | ||
| 206 | os.remove(rootfs) | ||
| 207 | |||
| 202 | p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) | 208 | p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) |
| 203 | if (pseudo_dir): | 209 | if (pseudo_dir): |
| 204 | pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix | 210 | pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix |
| 205 | pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir | 211 | pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir |
| 206 | pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir | 212 | pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir |
| 207 | pseudo += "export PSEUDO_NOSYMLINKEXP=1;" | 213 | pseudo += "export PSEUDO_NOSYMLINKEXP=1;" |
| 214 | pseudo += "export PSEUDO_IGNORE_PATHS=%s;" % (rootfs + "," + (get_bitbake_var("PSEUDO_IGNORE_PATHS") or "")) | ||
| 208 | pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") | 215 | pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") |
| 209 | else: | 216 | else: |
| 210 | pseudo = None | 217 | pseudo = None |
| 211 | 218 | ||
| 212 | rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, | ||
| 213 | self.lineno, self.fstype) | ||
| 214 | if os.path.isfile(rootfs): | ||
| 215 | os.remove(rootfs) | ||
| 216 | |||
| 217 | if not self.size and real_rootfs: | 219 | if not self.size and real_rootfs: |
| 218 | # The rootfs size is not set in .ks file so try to get it | 220 | # The rootfs size is not set in .ks file so try to get it |
| 219 | # from bitbake variable | 221 | # from bitbake variable |
