openembedded-core.git/scripts/lib/wic/imager/direct.py, branch uninative-1.0 Mirror of openembedded-core wic: use new syntax of 'except' statement 2016-05-14T06:26:42+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-05-04T13:06:19+00:00 15e88714d6b0a93f72e8a19b083fcc1f2006e128 New syntax 'except Exception as err' is supported by Python >= 2.7. Old syntax 'except Exception, err' is not supported by Python 3. Used new syntax to be able to run wic on Python 3. [YOCTO #9412] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
New syntax 'except Exception as err' is supported by Python >= 2.7.
Old syntax 'except Exception, err' is not supported by Python 3.

Used new syntax to be able to run wic on Python 3.

[YOCTO #9412]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: moved DiskImage to direct.py 2016-05-06T09:30:56+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-04-28T10:58:07+00:00 b3cc471790784c28f9362fcd6fc6a81c4316754c Moved DiskImage class from utils/fs_related.py to imager/direct.py as it's only used there. Removed fs_related module as it doesn't contain anything except of DiskImage. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
Moved DiskImage class from utils/fs_related.py to
imager/direct.py as it's only used there.

Removed fs_related module as it doesn't contain anything
except of DiskImage.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: add system_id argument to Image.add_partition 2016-04-29T06:53:57+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-04-22T09:32:02+00:00 f2733df697192c0010c17b7bbb02f8679cb8f313 Added new argument to add_partition call to pass partition system id down the stack. [YOCTO #9096] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> 
Added new argument to add_partition call to pass partition
system id down the stack.

[YOCTO #9096]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
wic: do not remove build dir in source plugins 2016-01-19T21:30:37+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-01-19T16:51:05+00:00 ba98262573cf1600e0d477317f51d488b5f8c4bd 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. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
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.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: get rid of 2 getters 2016-01-17T11:32:19+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-01-14T12:12:59+00:00 d34dd190e1da00ca8c9b2cb0adba15b9f0de2920 Used partitions and configfile bootloader attributes instead of using getters get_bootloader_file and get_partitions. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
Used partitions and configfile bootloader attributes instead of
using getters get_bootloader_file and get_partitions.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: get rid of get_rootfs and set_rootfs 2016-01-17T11:32:19+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-01-14T12:12:57+00:00 51ec52a62ce49d1a1a83489379990f78cfe849f9 Got rid of get_rootfs and set_rootfs java-like getter and setter. Renamed rootfs to rootfs_dir to be consistent with the name of kickstart parameter --rootfs-dir. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
Got rid of get_rootfs and set_rootfs java-like getter and
setter. Renamed rootfs to rootfs_dir to be consistent with
the name of kickstart parameter --rootfs-dir.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: adjust code for new data structure 2016-01-17T11:32:19+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-01-14T12:12:55+00:00 b46da0731e3f7016d0ab2a67967f07c7e199f219 New data structure is less nested than old one. Adjusted bootloader and partitions fields: self.ks.handler.bootloader -> self.ks.bootoader self.ks.handler.partitions -> self.ks.partitions Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
New data structure is less nested than old one.
Adjusted bootloader and partitions fields:
self.ks.handler.bootloader -> self.ks.bootoader
self.ks.handler.partitions -> self.ks.partitions

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: use new kickstart parser 2016-01-17T11:32:18+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2016-01-14T12:12:53+00:00 f72439d321220b724bfe2b4a92fed46c2c19fb3f Used KickStart parser class instead of pykickstart API. This commit breaks wic as data structures and field names provided by new API are a bit different from old ones. This issue will be addressed in the following commits. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
Used KickStart parser class instead of pykickstart API.

This commit breaks wic as data structures and field names
provided by new API are a bit different from old ones.
This issue will be addressed in the following commits.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
wic: fix partition size calculation 2015-09-21T14:20:08+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2015-09-10T12:38:03+00:00 3703ecb4aa5267e6d7330e7978cc7c3bb2250ead It was wrongly assumed that part.size is meagured in Mb. In fact it's in Kb, so there is no need to convert bitbake variable ROOTFS_SIZE as it's also in Kb. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 
It was wrongly assumed that part.size is meagured in Mb. In fact it's
in Kb, so there is no need to convert bitbake variable ROOTFS_SIZE as
it's also in Kb.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
wic: round variable before converting to int 2015-09-09T13:24:57+00:00 Ed Bartosh ed.bartosh@linux.intel.com 2015-09-07T10:01:13+00:00 3479e299b5f11dfcd3f5f97c4ad3e0449f6c6d6a Wic uses bitbake variable ROOTFS_SIZE to set correspondent partition size. This variable is a literal representing float value. Wic crashes trying to convert it to int with the error: invalid literal for int() with base 10: '10166.0' Fixed this by converting variable to float and rounding result. This should work for int and float literals. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 
Wic uses bitbake variable ROOTFS_SIZE to set correspondent
partition size. This variable is a literal representing
float value. Wic crashes trying to convert it to int with
the error: invalid literal for int() with base 10: '10166.0'

Fixed this by converting variable to float and rounding result.
This should work for int and float literals.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>