[PATCH] wic: don't throw away our created swap partition

[PATCH] wic: don't throw away our created swap partition

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

We were creating the partition, mkswap'ing it, and then not dd'ing it into
place in the final image, as source_file wasn't being set for swap partitions.
This would result in a swap partition that couldn't be enabled on target until
mkswap was run.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 scripts/lib/wic/kickstart/custom_commands/partition.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index eee25a4..a0e74aa 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -173,6 +173,7 @@ class Wic_PartData(FC4_PartData):
             if self.fstype and self.fstype == "swap":
                 self.prepare_swap_partition(cr_workdir, oe_builddir,
                                             native_sysroot)
+                self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
             elif self.fstype:
                 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
                                              self.lineno, self.fstype)
-- 
2.2.1

Re: [PATCH] wic: don't throw away our created swap partition

[Ed Bartosh]

Hi Cristopher,

Thank you for the patch!

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

On Thu, Feb 25, 2016 at 10:21:49AM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> We were creating the partition, mkswap'ing it, and then not dd'ing it into
> place in the final image, as source_file wasn't being set for swap partitions.
> This would result in a swap partition that couldn't be enabled on target until
> mkswap was run.
> 
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  scripts/lib/wic/kickstart/custom_commands/partition.py | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
> index eee25a4..a0e74aa 100644
> --- a/scripts/lib/wic/kickstart/custom_commands/partition.py
> +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
> @@ -173,6 +173,7 @@ class Wic_PartData(FC4_PartData):
>              if self.fstype and self.fstype == "swap":
>                  self.prepare_swap_partition(cr_workdir, oe_builddir,
>                                              native_sysroot)
> +                self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
>              elif self.fstype:
>                  rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
>                                               self.lineno, self.fstype)
> -- 
> 2.2.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
--
Regards,
Ed

Re: [PATCH] wic: don't throw away our created swap partition

[Francois Muller]

[-- Attachment #1: Type: text/plain, Size: 2269 bytes --]

Hi Ed,
May you also apply this patch to jethro branch please ?
Wks-created images requires also running mkswap on the target but it
shouldn't be necessary.
Best regards,
François
Le lundi 29 février 2016 à 17:11 +0200, Ed Bartosh a écrit :
> Hi Cristopher,
> 
> Thank you for the patch!
> 
> Acked-by: Ed Bartosh 
> org>
> 
> On Thu, Feb 25, 2016 at 10:21:49AM -0700, Christopher Larson wrote:
> > From: Christopher Larson 
> > c.gmane.org>
> > 
> > We were creating the partition, mkswap'ing it, and then not dd'ing
> > it into
> > place in the final image, as source_file wasn't being set for swap
> > partitions.
> > This would result in a swap partition that couldn't be enabled on
> > target until
> > mkswap was run.
> > 
> > Signed-off-by: Christopher Larson 
> > lfA@public.gmane.org>
> > ---
> >  scripts/lib/wic/kickstart/custom_commands/partition.py | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
> > b/scripts/lib/wic/kickstart/custom_commands/partition.py
> > index eee25a4..a0e74aa 100644
> > --- a/scripts/lib/wic/kickstart/custom_commands/partition.py
> > +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
> > @@ -173,6 +173,7 @@ class Wic_PartData(FC4_PartData):
> >              if self.fstype and self.fstype == "swap":
> >                  self.prepare_swap_partition(cr_workdir,
> > oe_builddir,
> >                                              native_sysroot)
> > +                self.source_file = "%s/fs.%s" % (cr_workdir,
> > self.fstype)
> >              elif self.fstype:
> >                  rootfs = "%s/fs_%s.%s.%s" % (cr_workdir,
> > self.label,
> >                                               self.lineno,
> > self.fstype)
> > -- 
> > 2.2.1
> > 
> > -- 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core-ZwoEplunGu3dfDuKDZ/zN51Ccm5ICvs9@public.gmane.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 
> -- 
> --
> Regards,
> Ed

[-- Attachment #2: Type: text/html, Size: 2650 bytes --]