* [wic][PATCH 0/3] wic bugfix and improvements
@ 2015-09-10 14:26 Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 1/3] wic: add dependencies to wic-image-minimal recipe Ed Bartosh
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ed Bartosh @ 2015-09-10 14:26 UTC (permalink / raw)
To: openembedded-core
Hi,
This patchset contains a changes suggested by QA team.
Daniel, thank you for suggestions!
The following changes since commit d4585fa23d56a58c583ee33db067a23177a936b1:
bsps: update 3.14 SRCREVs (2015-09-09 14:27:57 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wic/misc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/misc
Ed Bartosh (3):
wic: add dependencies to wic-image-minimal recipe
wic: use ext4 in wic-image-minimal.wks
wic: fix partition size calculation
meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 ++
meta-selftest/recipes-test/images/wic-image-minimal.wks | 6 +++---
scripts/lib/wic/imager/direct.py | 3 +--
3 files changed, 6 insertions(+), 5 deletions(-)
--
Ed
^ permalink raw reply [flat|nested] 4+ messages in thread
* [wic][PATCH 1/3] wic: add dependencies to wic-image-minimal recipe
2015-09-10 14:26 [wic][PATCH 0/3] wic bugfix and improvements Ed Bartosh
@ 2015-09-10 14:26 ` Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 2/3] wic: use ext4 in wic-image-minimal.wks Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 3/3] wic: fix partition size calculation Ed Bartosh
2 siblings, 0 replies; 4+ messages in thread
From: Ed Bartosh @ 2015-09-10 14:26 UTC (permalink / raw)
To: openembedded-core
Added "DEPENDS =" line to the recipe to ensure that all tools required
for image creation are built.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb
index 073c569..69236c4 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.bb
+++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb
@@ -5,6 +5,8 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
IMAGE_FSTYPES = "wic.bz2"
RM_OLD_IMAGE = "1"
+DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native"
+
# core-image-minimal is referenced in .wks, so we need its rootfs
# to be ready before our rootfs
do_rootfs[depends] += "core-image-minimal:do_rootfs"
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [wic][PATCH 2/3] wic: use ext4 in wic-image-minimal.wks
2015-09-10 14:26 [wic][PATCH 0/3] wic bugfix and improvements Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 1/3] wic: add dependencies to wic-image-minimal recipe Ed Bartosh
@ 2015-09-10 14:26 ` Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 3/3] wic: fix partition size calculation Ed Bartosh
2 siblings, 0 replies; 4+ messages in thread
From: Ed Bartosh @ 2015-09-10 14:26 UTC (permalink / raw)
To: openembedded-core
ext4 is used in canned wks files, so let's use it here too
for the sake of consistency.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta-selftest/recipes-test/images/wic-image-minimal.wks | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks
index 29cd8f2..8f9be09 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.wks
+++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks
@@ -3,8 +3,8 @@
# created from core-image-minimal and wic-image-minimal image recipes.
part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
-part / --source rootfs --ondisk sda --fstype=ext2 --label platform --align 1024
-part /core --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext2 --label core --align 1024
-part /backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext2 --label backup --align 1024
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
+part /core --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024
+part /backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label backup --align 1024
bootloader --timeout=0 --append="rootwait console=tty0"
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [wic][PATCH 3/3] wic: fix partition size calculation
2015-09-10 14:26 [wic][PATCH 0/3] wic bugfix and improvements Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 1/3] wic: add dependencies to wic-image-minimal recipe Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 2/3] wic: use ext4 in wic-image-minimal.wks Ed Bartosh
@ 2015-09-10 14:26 ` Ed Bartosh
2 siblings, 0 replies; 4+ messages in thread
From: Ed Bartosh @ 2015-09-10 14:26 UTC (permalink / raw)
To: openembedded-core
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>
---
scripts/lib/wic/imager/direct.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 146a0d1..d5603fa 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -241,8 +241,7 @@ class DirectImageCreator(BaseImageCreator):
# IMAGE_OVERHEAD_FACTOR and IMAGE_ROOTFS_EXTRA_SPACE
rsize_bb = get_bitbake_var('ROOTFS_SIZE', image_name)
if rsize_bb:
- # convert from Kb to Mb
- part.size = int(round(float(rsize_bb) / 1024.))
+ part.size = int(round(float(rsize_bb)))
# need to create the filesystems in order to get their
# sizes before we can add them and do the layout.
# Image.create() actually calls __format_disks() to create
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-10 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-10 14:26 [wic][PATCH 0/3] wic bugfix and improvements Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 1/3] wic: add dependencies to wic-image-minimal recipe Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 2/3] wic: use ext4 in wic-image-minimal.wks Ed Bartosh
2015-09-10 14:26 ` [wic][PATCH 3/3] wic: fix partition size calculation Ed Bartosh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.