[wic][PATCH 1/2] wic: rawcopy: ensure comparison is done on int

[wic][PATCH 1/2] wic: rawcopy: ensure comparison is done on int

[Alexandre Belloni]

The size comparison may fail because it is done on strings rather than
integers.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 scripts/lib/wic/plugins/source/rawcopy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index cf6236a04f91..ba7fda787ed7 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -77,7 +77,7 @@ class RawCopyPlugin(SourcePlugin):
         out = exec_cmd(du_cmd)
         filesize = out.split()[0]
 
-        if filesize > part.size:
+        if int(filesize) > int(part.size):
             part.size = filesize
 
         part.source_file = dst
-- 
2.1.0

[wic][PATCH 2/2] wic: support ontrackdm6aux3 partitions

[Alexandre Belloni]

ontrack dm6 aux3 is a type of partition required to be able to boot a Freescale
mxs based platform.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 scripts/lib/wic/utils/partitionedfs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 162f8e1b9c6a..f394abc764c7 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -296,6 +296,8 @@ class Image:
                 parted_fs_type = "fat32"
             elif p['fstype'] == "msdos":
                 parted_fs_type = "fat16"
+            elif p['fstype'] == "ontrackdm6aux3":
+                parted_fs_type = "ontrackdm6aux3"
             else:
                 # Type for ext2/ext3/ext4/btrfs
                 parted_fs_type = "ext2"
-- 
2.1.0

Re: [wic][PATCH 2/2] wic: support ontrackdm6aux3 partitions

[Ed Bartosh]

On Tue, Apr 07, 2015 at 12:21:59PM +0200, Alexandre Belloni wrote:
> ontrack dm6 aux3 is a type of partition required to be able to boot a Freescale
> mxs based platform.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>  scripts/lib/wic/utils/partitionedfs.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
> index 162f8e1b9c6a..f394abc764c7 100644
> --- a/scripts/lib/wic/utils/partitionedfs.py
> +++ b/scripts/lib/wic/utils/partitionedfs.py
> @@ -296,6 +296,8 @@ class Image:
>                  parted_fs_type = "fat32"
>              elif p['fstype'] == "msdos":
>                  parted_fs_type = "fat16"
> +            elif p['fstype'] == "ontrackdm6aux3":
> +                parted_fs_type = "ontrackdm6aux3"
>              else:
>                  # Type for ext2/ext3/ext4/btrfs
>                  parted_fs_type = "ext2"

Acked-by: Ed Bartosh <ed.bartosh@linux.intel.com>

--
Regards,
Ed

Re: [wic][PATCH 1/2] wic: rawcopy: ensure comparison is done on int

[Ed Bartosh]

On Tue, Apr 07, 2015 at 12:21:58PM +0200, Alexandre Belloni wrote:
> The size comparison may fail because it is done on strings rather than
> integers.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>  scripts/lib/wic/plugins/source/rawcopy.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
> index cf6236a04f91..ba7fda787ed7 100644
> --- a/scripts/lib/wic/plugins/source/rawcopy.py
> +++ b/scripts/lib/wic/plugins/source/rawcopy.py
> @@ -77,7 +77,7 @@ class RawCopyPlugin(SourcePlugin):
>          out = exec_cmd(du_cmd)
>          filesize = out.split()[0]
>  
> -        if filesize > part.size:
> +        if int(filesize) > int(part.size):
>              part.size = filesize
>  
>          part.source_file = dst

Acked-by: Ed Bartosh <ed.bartosh@linux.intel.com>

--
Regards,
Ed