summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/partition.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic/partition.py')
-rw-r--r--scripts/lib/wic/partition.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 647a6fb3a7..f0e88fb4e8 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -136,11 +136,11 @@ class Partition():
136 "specify a non-zero --size/--fixed-size for that " 136 "specify a non-zero --size/--fixed-size for that "
137 "partition." % self.mountpoint) 137 "partition." % self.mountpoint)
138 138
139 if self.fstype and self.fstype == "swap": 139 if self.fstype == "swap":
140 self.prepare_swap_partition(cr_workdir, oe_builddir, 140 self.prepare_swap_partition(cr_workdir, oe_builddir,
141 native_sysroot) 141 native_sysroot)
142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype) 142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
143 elif self.fstype: 143 else:
144 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, 144 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
145 self.lineno, self.fstype) 145 self.lineno, self.fstype)
146 if os.path.isfile(rootfs): 146 if os.path.isfile(rootfs):
@@ -217,10 +217,6 @@ class Partition():
217 if os.path.isfile(rootfs): 217 if os.path.isfile(rootfs):
218 os.remove(rootfs) 218 os.remove(rootfs)
219 219
220 if not self.fstype:
221 raise WicError("File system for partition %s not specified in "
222 "kickstart, use --fstype option" % self.mountpoint)
223
224 # Get rootfs size from bitbake variable if it's not set in .ks file 220 # Get rootfs size from bitbake variable if it's not set in .ks file
225 if not self.size: 221 if not self.size:
226 # Bitbake variable ROOTFS_SIZE is calculated in 222 # Bitbake variable ROOTFS_SIZE is calculated in