summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-19 18:51:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:13 +0000
commit3fc6aaa1862a735322264049dcb50c69acf30d36 (patch)
treef2237b68c2c1fcb7c7f5b67a1e8530151b80d7c8
parent8d34eea303f1a8bbfeb01252330b0f6dfd92bbf7 (diff)
downloadpoky-3fc6aaa1862a735322264049dcb50c69acf30d36.tar.gz
wic: do not remove build dir in source plugins
Interesting bug was found during implementation of 'include' parser command. Build directory was removed in do_configure_partition method of bootimg- source plugins. This can cause removal of previously prepared partition images if /boot partition is mentioned after other partitions in .ks file. Moved work directory removal to direct.py before processing partitions. (From OE-Core rev: ba98262573cf1600e0d477317f51d488b5f8c4bd) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/imager/direct.py3
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py3
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
4 files changed, 3 insertions, 7 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 8d4daece0d..a1b4249651 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -229,6 +229,9 @@ class DirectImageCreator(BaseImageCreator):
229 229
230 fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) 230 fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
231 231
232 shutil.rmtree(self.workdir)
233 os.mkdir(self.workdir)
234
232 for part in parts: 235 for part in parts:
233 # get rootfs size from bitbake variable if it's not set in .ks file 236 # get rootfs size from bitbake variable if it's not set in .ks file
234 if not part.size: 237 if not part.size:
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 125c943d12..a4734c9b36 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -142,8 +142,6 @@ class BootimgEFIPlugin(SourcePlugin):
142 Called before do_prepare_partition(), creates loader-specific config 142 Called before do_prepare_partition(), creates loader-specific config
143 """ 143 """
144 hdddir = "%s/hdd/boot" % cr_workdir 144 hdddir = "%s/hdd/boot" % cr_workdir
145 rm_cmd = "rm -rf %s" % cr_workdir
146 exec_cmd(rm_cmd)
147 145
148 install_cmd = "install -d %s/EFI/BOOT" % hdddir 146 install_cmd = "install -d %s/EFI/BOOT" % hdddir
149 exec_cmd(install_cmd) 147 exec_cmd(install_cmd)
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index bc2ca0f6fa..b76c1211ae 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -71,9 +71,6 @@ class BootimgPartitionPlugin(SourcePlugin):
71 - copies all files listed in IMAGE_BOOT_FILES variable 71 - copies all files listed in IMAGE_BOOT_FILES variable
72 """ 72 """
73 hdddir = "%s/boot" % cr_workdir 73 hdddir = "%s/boot" % cr_workdir
74 rm_cmd = "rm -rf %s/boot" % cr_workdir
75 exec_cmd(rm_cmd)
76
77 install_cmd = "install -d %s" % hdddir 74 install_cmd = "install -d %s" % hdddir
78 exec_cmd(install_cmd) 75 exec_cmd(install_cmd)
79 76
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index a1bfa2671e..5b719bf3bb 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -78,8 +78,6 @@ class BootimgPcbiosPlugin(SourcePlugin):
78 Called before do_prepare_partition(), creates syslinux config 78 Called before do_prepare_partition(), creates syslinux config
79 """ 79 """
80 hdddir = "%s/hdd/boot" % cr_workdir 80 hdddir = "%s/hdd/boot" % cr_workdir
81 rm_cmd = "rm -rf " + cr_workdir
82 exec_cmd(rm_cmd)
83 81
84 install_cmd = "install -d %s" % hdddir 82 install_cmd = "install -d %s" % hdddir
85 exec_cmd(install_cmd) 83 exec_cmd(install_cmd)