On Thu, Jan 11, 2018 at 10:55:18PM +0800, rebecca.swee.fun.ch...@intel.com
wrote:
> Hi all,
>
> As the subject called out: this patch series enable wic in eSDK.
> The details of what I have done are documented within the commit message.
> Basically wic requires an OE build environment, but we are
On Tue, Jan 09, 2018 at 04:35:24PM +0300, Dogukan Ergun wrote:
> Under some conditions, ioctl FIGETBSZ can't return real value.
> We can try to use fallback via os.stat() to get block size.
>
Thank you for the patch!
+1
> Source of patch:
> https://github.com/intel/bmap-tools/commit/17365f4fe9
On Tue, Dec 12, 2017 at 03:54:04AM -0800, anelliot wrote:
> The wic help output formally consisted of manually created strings mixed with
> argparse,
> which wasunformatted and unusable. This fix cleans up the help messages,
> rewrites help
> functionality to use argparse, and adds functionality
On Tue, Nov 28, 2017 at 01:56:11PM +0100, Martin Hundebøll wrote:
> The '--label' argument should work for '--source rawcopy' as it does for
> '--source rootfs', so add a method in RawCopyPlugin to update the label
> on the temporary filesystem images.
>
> Signed-off-by: Martin Hundebøll
Thank y
Hi Tom,
Thank you for the great patchset!
+1
On Fri, Nov 17, 2017 at 11:08:16AM -0500, Tom Rini wrote:
> Hey all,
>
> So, per Ed's feedback on my first series, I went and spent some time
> trying to figure out how to have wic know what the UUID would be when
> updating the fstab. It turns out
On Thu, Nov 16, 2017 at 02:49:43PM +0300, Dogukan Ergun wrote:
> Docker's aufs filesystem doesn't support file ioctl operations like FIGETBSZ
> or FIEMAP.
> Sparse_copy operation will fail if those ioctls are not supported.
> If sparse_copy fails while generating wic images, fallback to dd for copy
On Wed, Nov 08, 2017 at 10:00:54AM -0500, Tom Rini wrote:
> On Wed, Nov 08, 2017 at 01:20:15PM +0200, Ed Bartosh wrote:
> > On Tue, Nov 07, 2017 at 09:54:57AM -0500, Tom Rini wrote:
> > > On Tue, Nov 07, 2017 at 10:11:35AM +0200, Ed Bartosh wrote:
> > > > On Mon, No
On Wed, Nov 08, 2017 at 12:04:09PM +0100, Nicolas Dechesne wrote:
> From: Artur Mądrzak
>
> The WIC's 'part' can now give a name for GPT partition in WKS file.
> It's similar to '--label', but is naming partintions instead file systems.
> It's required by some bootloaders to partitions have speci
On Tue, Nov 07, 2017 at 09:54:57AM -0500, Tom Rini wrote:
> On Tue, Nov 07, 2017 at 10:11:35AM +0200, Ed Bartosh wrote:
> > On Mon, Nov 06, 2017 at 07:44:23AM -0500, Tom Rini wrote:
> > > On Mon, Nov 06, 2017 at 09:36:20AM -0200, Otavio Salvador wrote:
> > > > On M
On Mon, Nov 06, 2017 at 07:44:17AM -0500, Tom Rini wrote:
> > Can you rebase your patchset on top of current master?
>
> Yes, OK.
>
> > It would be also nice to get this functionality covered by tests.
>
> OK, but what part of oe-selftest, and how exactly? Can one easily check
> the resulting f
On Mon, Nov 06, 2017 at 07:44:23AM -0500, Tom Rini wrote:
> On Mon, Nov 06, 2017 at 09:36:20AM -0200, Otavio Salvador wrote:
> > On Mon, Nov 6, 2017 at 8:08 AM, Ed Bartosh
> > wrote:
> > > On Fri, Nov 03, 2017 at 08:51:50AM -0400, Tom Rini wrote:
> > >> On F
On Fri, Nov 03, 2017 at 08:51:50AM -0400, Tom Rini wrote:
> On Fri, Oct 20, 2017 at 09:15:05AM -0400, Tom Rini wrote:
> > On Tue, Oct 10, 2017 at 05:01:49PM -0400, Tom Rini wrote:
> > > On Thu, Sep 21, 2017 at 01:46:16PM -0400, Tom Rini wrote:
> > > > When we have been told to use the UUID we shoul
On Tue, Oct 31, 2017 at 04:08:58PM +0100, Nicolas Dechesne wrote:
> On Tue, Oct 31, 2017 at 2:33 PM, Ed Bartosh
> wrote:
> >
> > On Mon, Oct 30, 2017 at 08:53:09PM +0100, Artur Mądrzak wrote:
> > > The WIC's 'part' can now give a name for GPT partition i
On Mon, Oct 30, 2017 at 08:53:09PM +0100, Artur Mądrzak wrote:
> The WIC's 'part' can now give a name for GPT partition in WKS file.
> It's similar to '--label', but is naming partitions instead file systems.
> It's required by some bootloaders to partitions have specified names.
>
Thank you for
support installed.
>
Thank you for the patch.
+1
> Signed-off-by: Tom Rini
> ---
> Changes in v2:
> - Switch to checking for '.bmap' not 'bmap', per Ed Bartosh.
> ---
> meta/classes/image_types.bbclass | 3 +++
> 1 file changed, 3 insertions(+)
>
&
On Fri, Sep 29, 2017 at 08:36:52AM -0400, Tom Rini wrote:
> On Fri, Sep 29, 2017 at 02:16:21PM +0300, Ed Bartosh wrote:
> > On Wed, Sep 27, 2017 at 01:00:09PM -0400, Tom Rini wrote:
> > > With RSS we need to ensure that when making a bmap image that the
> > > python3 t
On Fri, Sep 29, 2017 at 08:35:42AM -0400, Tom Rini wrote:
> On Fri, Sep 29, 2017 at 02:27:57PM +0300, Ed Bartosh wrote:
> > On Thu, Sep 28, 2017 at 01:44:29PM -0400, Tom Rini wrote:
> > > On Thu, Sep 28, 2017 at 06:47:07PM +0300, Ed Bartosh wrote:
> > > > On Wed, Se
On Thu, Sep 28, 2017 at 01:44:29PM -0400, Tom Rini wrote:
> On Thu, Sep 28, 2017 at 06:47:07PM +0300, Ed Bartosh wrote:
> > On Wed, Sep 20, 2017 at 12:03:27PM -0400, Tom Rini wrote:
> > > In the case of non-wic images there is logic today to generate a
> > > startup.nsh
On Wed, Sep 27, 2017 at 01:00:09PM -0400, Tom Rini wrote:
> With RSS we need to ensure that when making a bmap image that the
> python3 that we created is found via /usr/bin/env rather than the host
> python3. Otherwise we're relying on the build host to have bmaptool
> support installed.
>
> Sig
show_bug.cgi?id=10073
> This extends the logic we have today in wic to save the
> name of the loader that's being placed and if no startup.nsh is provided
> already generate the default kind that grub-efi/systemd-boot.bbclass
> generate.
>
> Cc: Ed Bartosh
> Cc: Christo
On Wed, Sep 27, 2017 at 01:00:09PM -0400, Tom Rini wrote:
> With RSS we need to ensure that when making a bmap image that the
> python3 that we created is found via /usr/bin/env rather than the host
> python3. Otherwise we're relying on the build host to have bmaptool
> support installed.
>
Can
On Thu, Sep 21, 2017 at 05:21:44PM -0400, Tom Rini wrote:
> On Thu, Sep 21, 2017 at 04:20:30PM -0500, Mark Hatle wrote:
> > On 9/21/17 4:15 PM, Otavio Salvador wrote:
> > > On Thu, Sep 21, 2017 at 2:46 PM, Tom Rini wrote:
> > >> When we have been told to use the UUID we should also update the fsta
On Tue, Sep 12, 2017 at 03:23:40PM +0200, Enrico Scholz wrote:
> Ed Bartosh writes:
>
> > I agree. --size is less suitable for your needs than extra space and
> > overhead factor. I still don't like the idea of using them to reserve
> > non-formatted space.
>
On Tue, Sep 12, 2017 at 02:18:41PM +0200, Enrico Scholz wrote:
> Ed Bartosh writes:
>
> >> >> >> The --extra-space and --overhead option did not had an effect to
> >> >> >> squashfs
> >> >> >> partitions. Although squashfs i
On Tue, Sep 12, 2017 at 11:44:02AM +0200, Enrico Scholz wrote:
> Ed Bartosh writes:
>
> >> >> The --extra-space and --overhead option did not had an effect to
> >> >> squashfs
> >> >> partitions. Although squashfs is read-only, it can be use
On Mon, Sep 11, 2017 at 04:04:40PM +0200, Enrico Scholz wrote:
> Ed Bartosh writes:
>
> >> The --extra-space and --overhead option did not had an effect to squashfs
> >> partitions. Although squashfs is read-only, it can be useful to allocate
> >> more space f
On Fri, Sep 08, 2017 at 07:33:03PM +0200, Enrico Scholz wrote:
> From: Enrico Scholz
>
> The --extra-space and --overhead option did not had an effect to squashfs
> partitions. Although squashfs is read-only, it can be useful to allocate
> more space for the on-disk partition to avoid repartitio
bmap-tools is the only recipe in oe-core that still uses
Python 2. Switching it to Python 3 should help to get rid of
building native Python 2 and its dependencies.
[YOCTO #11891]
Signed-off-by: Ed Bartosh
---
meta/recipes-support/bmap-tools/bmap-tools_3.4.bb | 7 ++-
1 file changed, 2
Modified wic code to run bmaptool using native Python3
from wic-tools native sysroot.
[YOCTO #11891]
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/imager/direct.py | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py
b
Upgraded to the latest upstream release.
Signed-off-by: Ed Bartosh
---
.../bmap-tools/{bmap-tools_3.2.bb => bmap-tools_3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/bmap-tools/{bmap-tools_3.2.bb =>
bmap-tools_3.4.bb} (84%)
://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (3):
bmap-tools: upgrade to v3.4
bmap-tools: switch to Python 3
wic: run bmaptool with native Python3
.../bmap-tools/{bmap-tools_3.2.bb => bmap-tools_3.4.bb} | 9 +++--
scripts/lib/wic/plugins/imager/direct
Modified wic code to run bmaptool using native Python3
from wic-tools native sysroot.
[YOCTO: #11891]
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/imager/direct.py | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py
b
bmap-tools is the only recipe in oe-core that still uses
Python 2. Switching it to Python 3 should help to get rid of
building native Python 2 and its dependencies.
[YOCTO: #11891]
Signed-off-by: Ed Bartosh
---
meta/recipes-support/bmap-tools/bmap-tools_3.4.bb | 7 ++-
1 file changed, 2
Upgraded to the latest upstream release.
Signed-off-by: Ed Bartosh
---
.../bmap-tools/{bmap-tools_3.2.bb => bmap-tools_3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/bmap-tools/{bmap-tools_3.2.bb =>
bmap-tools_3.4.bb} (85%)
test_wic_rm_ext test case (2017-09-05 14:28:41 +0300)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wip
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (3):
bmap-tools: upgrade to v3.4
bmap-tools: switch to Python 3
wic: run
Added ext* partitions to the description of 'wic ls',
'wic cp' and 'wic rm' commands.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/help.py | 64 -
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/scr
Implemented copying files to the ext partition
using debugfs tool.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index c6a63f2080a..9ebd93ae278
Tested if 'wic cp' correctly copies files to the ext4 partition
of the wic image.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 30 ++
1 file changed, 30 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeq
Tested if 'wic rm' correctly removes files from the ext4 partition
of the wic image.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 23 +++
1 file changed, 23 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/self
Implemented listing directory contents for ext file
system using debugfs tool.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index eafc6c783ec
Implemented removing files or directories from the ext
partition using debugfs tool.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 27 ---
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
Tested if 'wic ls' correctly lists directory contents
of the ext* partition.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 16
1 file changed, 16 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wi
)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wip
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (7):
wic: implement ext fs support for 'wic ls'
wic: implement ext fs support for 'wic cp'
wic: implemen
On Thu, Aug 31, 2017 at 09:17:03AM +0200, Mike Looijmans wrote:
> I noticed that the "wic" recipes appear to focus on the host only.
>
> Would it be possible to run "wic" on target?
>
> For example, it would be really convenient to be able to program the eMMC
> using wic and auto-expanding the r
Got rid of lazy evaluation of self.partitions property.
It's not needed because partitions of the source image should
be always read.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/engine
ff-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 53 +
1 file changed, 53 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wic.py
index aaefd4f..aa73ba4 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
This command writes image to the media or another file with
the possibility to expand partitions to fill free target space.
[YOCTO #11278]
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 146 ++
scripts/lib/wic/help.py | 40
Added sfdisk, e2fsck, mkswap, resize2fs, mkdosfs to the
list of used tools in Disk class. They're going to be used
in 'wic write' implementation.
Added dependency to util-linux to wic-tools to ensure that
sfdisk and mkswap are available from wic-tools native sysroot.
Signed-off
This parameter specifies list of supported filesystems.
So far only 'fat' is supported, but 'wic write' is going
to support at least 'fat', 'ext' and 'swap'.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 9 +++--
1 file chan
Converted partition number to int in order to use
it as an index in the list of partitions.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index a965b8b
Got partition type and sector sizes from the output
of 'parted print'. This info may be used in the implementation
of 'wic write' command.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --g
ed typo in commit message
The following changes since commit a087e0bc765ade6386720f22d842e2fc0bd5f128:
maintainers.inc: assign newly added recipes (2017-08-24 16:49:57 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wip
http://git.yoctoproject.org
So far every used tool have to have separate property and
private attribute in the Disk class. This is too verbose,
considering that there will be much more tools used.
Reimplemented getting tools paths using custom __getattr__
method. This is much more compact and readable.
Signed-off-by: Ed
ff-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 53 +
1 file changed, 53 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wic.py
index aaefd4f..aa73ba4 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
This command writes image to the media or another file with
the possibility to expand partitions to fill free target space.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 142 +-
1 file changed, 141 insertions(+), 1 deletion(-)
diff --git
Added sfdisk, e2fsck, mkswap, resize2fs, mkdosfs to the
list of used tools in Disk class. They're going to be used
in 'wic write' implementation.
Added dependency to util-linux to wic-tools to ensure that
sfdisk and mkswap are available from wic-tools native sysroot.
Signed-off
Got rid of lazy evaluation of self.partitions property.
It's not needed because partitions of the source image should
be always read.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/engine
Converted partition number to int in order to use
it as an index in the list of partitions.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index b8fd3ae
So far every used tool have to have separate property and
private attribute in the Disk class. This is too verbose,
considering that there will be much more tools used.
Reimplemented getting tools paths using custom __getattr__
method. This is much more compact and readable.
Signed-off-by: Ed
Added wic_write_help and wic_write_usage variables to the help.py module.
These variables contain help content that will be used in 'wic write help'
and 'wic write --help' output.
[YOCTO #11278]
Signed-off-by: Ed Bartosh
---
scripts/
Added empty 'wic write' command that does nothing.
The functionality will be added by the next commits.
[YOCTO #11278]
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 6 ++
scripts/wic | 55 +++
2 files c
This parameter specifies list of supported filesystems.
So far only 'fat' is supported, but 'wic write' is going
to support at least 'fat', 'ext' and 'swap'.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 9 +++--
1 file chan
Got partition type and sector sizes from the output
of 'parted print'. This info may be used in the implementation
of 'wic write' command.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/engine.py | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --g
fc0bd5f128:
maintainers.inc: assign newly added recipes (2017-08-24 16:49:57 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wip
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (10):
wic: add help and usage content f
On Tue, Aug 01, 2017 at 07:13:47PM +0200, liu.min...@gmail.com wrote:
> From: Ming Liu
>
> It's being set in image_types_wic.bbclass, not need to double set it
> here, furthermore, the dependencies are incomplete by missing
> e2fsprogs-native.
>
> Signed-off-by: Ming Liu
> ---
> meta-selftest/
On Tue, Aug 01, 2017 at 07:13:49PM +0200, liu.min...@gmail.com wrote:
> From: Ming Liu
>
> They are being controlled by WKS_FILE_DEPENDS_DEFAULT, the code here
> is redundant and incomplete as well.
>
> Signed-off-by: Ming Liu
> ---
> meta/conf/machine/qemux86.conf | 1 -
> 1 file changed, 1 d
On Tue, Aug 01, 2017 at 07:13:48PM +0200, liu.min...@gmail.com wrote:
> From: Ming Liu
>
> Drop do_image_wic depends varflags, move the dependencies to
> WKS_FILE_DEPENDS_DEFAULT. I can not see the need to maintain them
> in two different ways, besides that it's out of USING_WIC control.
>
> Sig
On Mon, Jul 31, 2017 at 06:04:47PM +1000, Jonathan Liu wrote:
> >
> > How about random.SystemRandom().randrange(1, 0x) ?
> >
>
> random.SystemRandom().randint(1, 0x) actually
>
This looks ok to me. Thanks.
--
Regards,
Ed
--
___
Openem
On Sun, Jul 30, 2017 at 08:37:26PM +1000, Jonathan Liu wrote:
> Hi Ed,
>
> On 30 July 2017 at 20:02, Ed Bartosh wrote:
> > On Sat, Jul 29, 2017 at 12:45:27AM +1000, Jonathan Liu wrote:
> >> Zero may be interpreted as no MBR signature present and another
> >> par
is built), but it makes
NOHDD and NOISO working as expected.
[YOCTO #11842]
Signed-off-by: Ed Bartosh
---
meta/conf/machine/include/x86-base.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/x86-base.inc
b/meta/conf/machine/include/x86-base.i
On Sat, Jul 29, 2017 at 12:45:27AM +1000, Jonathan Liu wrote:
> Zero may be interpreted as no MBR signature present and another
> partitioning program might install a new MBR signature.
>
> Signed-off-by: Jonathan Liu
> ---
> scripts/lib/wic/plugins/imager/direct.py | 2 +-
> 1 file changed, 1 i
On Fri, Jul 28, 2017 at 09:35:37PM +1000, Jonathan Liu wrote:
> Hi Tom,
>
> On 28 July 2017 at 21:31, Tom Rini wrote:
> > On Fri, Jul 28, 2017 at 09:09:55PM +1000, Jonathan Liu wrote:
> >> Hi Tom,
> >>
> >> On 26 July 2017 at 05:58, Tom Rini wrote:
> >> > The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate
_dir. This should fix the report.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b/scripts/lib/wic/plugins/source/rootfs.py
index c08f760..e438158 100644
---
Using relative paths can cause copyhardlinktree API to fail as
it changes current directory when working. Converted all paths
to absolute paths using os.path.realpath.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions
This test case boots the image in qemu and checks for mounted
partitions. As /boot is mounted automatically the test case fails.
Fixed this by adding /boot to the list of mounted partitions.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
1 file changed, 1 insertion
Used unique suffix (line number from .wks file) for the
copied rootfs directory to avoid possible conflicts.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b
wic avoided adding /boot to fstab for no reason.
This exception was hardcoded in the wic code.
There is no need for this as mountpoint in .wks file is an optional
field. It can be used only if user wants to have partitions
automatically mounted on system boot.
[YOCTO #11662]
Signed-off-by: Ed
temporary location
before updating fstab to avoid conflicts with other tasks working
with the same rootfs directory.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/imager/direct.py | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/scripts/lib/wic
to change it, e.g. do_image_wic does this to
update etc/fstab.
Ignored tar exit code 1 to be able to hardlink rootfs content while
do_rootfs_tar is tarring it.
Signed-off-by: Ed Bartosh
---
meta/classes/image_types.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/me
oky-contrib ed/wip
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (7):
image_types.bbclass: ignore tar exit code 1
wic: copy rootfs directory before changing fstab
wic: use absolute paths in rootfs plugin
wic: rootfs: fix rootfs path reporting
wic: rootfs:
the CONVERSION_CMD framework. The equivalent of vmdk is now wic.vmdk
> and so forth for the other types.
>
> Signed-off-by: Tom Rini
Acked-by: Ed Bartosh
> ---
> Changes in v2:
> - Update runqemu help (code matches .wic.vmdk as vmdk, does right thing,
> tested).
>
Using relative paths can cause copyhardlinktree API to fail as
it changes current directory when working. Converted all paths
to absolute paths using os.path.realpath.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions
This test case boots the image in qemu and checks for mounted
partitions. As /boot is mounted automatically the test case fails.
Fixed this by adding /boot to the list of mounted partitions.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
1 file changed, 1 insertion
wic avoided adding /boot to fstab for no reason.
This exception was hardcoded in the wic code.
There is no need for this as mountpoint in .wks file is an optional
field. It can be used only if user wants to have partitions
automatically mounted on system boot.
[YOCTO #11662]
Signed-off-by: Ed
_dir. This should fix the report.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b/scripts/lib/wic/plugins/source/rootfs.py
index c08f760..e438158 100644
---
Used unique suffix (line number from .wks file) for the
copied rootfs directory to avoid possible conflicts.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b
location
before updating fstab to avoid conflicts with other tasks working
with the same rootfs directory.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/imager/direct.py | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/scripts/lib/wic/plugins
302f750edfffbd10:
wic-tools: add dependency to e2fsprogs-native (2017-07-27 16:07:26 +0300)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wip
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip
Ed Bartosh (6):
wic: copy rootfs directo
Added e2fsprogs-native to the list of dependencies for wic-tools
as all fs-related utilities have to be in this list.
Signed-off-by: Ed Bartosh
---
meta/recipes-core/meta/wic-tools.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/meta/wic-tools.bb
b/meta
is OK.
Changed extra options for mkfs.btrfs to '--quiet' to fix the failure.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wic.p
Added e2fsprogs-native to the list of default dependencies for
wic (WKS_FILE_DEPENDS_DEFAULT) as all fs-related utilities
have to be in this list.
Thanks to Patrick Ohly for noticing this.
[YOCTO #11817]
Signed-off-by: Ed Bartosh
---
meta/classes/image_types_wic.bbclass | 2 +-
1 file changed
On Wed, Jul 26, 2017 at 10:29:09AM +0300, Ed Bartosh wrote:
> On Tue, Jul 25, 2017 at 03:58:22PM -0400, Tom Rini wrote:
> > The most portable way to specifiy a root device in a disk image that we
> > create is to use PARTUUID rather than /dev/sda2. As background, both
> &g
is OK.
Changed extra options for mkfs.btrfs to '--quiet' to fix the failure.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wic.p
ual disk controller.
>
I suspect oe-selftest needs to be adjusted for this change.
Please run "oe-selftest -r wic" to ensure all tests pass.
> Cc: Ed Bartosh
> Cc: Matt Porter
> Signed-off-by: Tom Rini
> ---
> scripts/lib/wic/canned-wks/common.wks.inc
underlying disk
> content has changed at least slightly from the old vmdk type to the new
> type and that we can simply handle this change in documentation. As
> such, if there's agreement about dropping the types I'll include some
> documentation changes in the next version
>
> Fixes: 46bc438374de ("image.bbclass: do exact match for rootfs type")
> Cc: Zhenhua Luo
> Cc: Richard Purdie
> Cc: Patrick Ohly
> Signed-off-by: Tom Rini
Acked-by: Ed Bartosh
Any chance to have this functionality covered by oe-selftest?
That would help
wic avoided adding /boot to fstab for no reason.
This exception was hardcoded in the wic code.
There is no need for this as mountpoint in .wks file is an optional
field. It can be used only if user wants to have partitions
automatically mounted on system boot.
[YOCTO #11662]
Signed-off-by: Ed
This test case boots the image in qemu and checks for mounted
partitions. As /boot is mounted automatically the test case fails.
Fixed this by adding /boot to the list of mounted partitions.
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
1 file changed, 1 insertion
Used unique suffix (line number from .wks file) for the
copied rootfs directory to avoid possible conflicts.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b
_dir. This should fix the report.
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/plugins/source/rootfs.py | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b/scripts/lib/wic/plugins/source/rootfs.py
index c08f760..e438158 100644
---
1 - 100 of 1334 matches
Mail list logo