* [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining
2016-07-27 12:51 [PATCH v4 0/4] image creation improvements Ed Bartosh
@ 2016-07-27 12:51 ` Ed Bartosh
2016-07-28 20:42 ` Richard Purdie
2016-07-28 20:51 ` Richard Purdie
2016-07-27 12:51 ` [PATCH v4 2/4] image creation: support converting masked types Ed Bartosh
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Ed Bartosh @ 2016-07-27 12:51 UTC (permalink / raw)
To: openembedded-core
From: Patrick Ohly <patrick.ohly@intel.com>
When using conversion chaining (for example example: .dsk.vdi.xz),
the imagetypes_getdepends() did not properly detect all compression
commands (thus skipping the corresponding COMPRESS_DEPENDS) and
the base type, leading to missing dependencies of the image's do_rootfs
task.
This is not a big problem in practice because in those cases where
conversion chaining is useful (as in the example above), the missing
dependency is qemu-native, which typically gets built anyway.
imagetypes_getdepends() had hard-coded special treatment for certain
image types. This gets replaced with setting the normal IMAGE_DEPENDS
variables for these types.
[YOCTO #9076]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image.bbclass | 19 ++-----------
meta/classes/image_types.bbclass | 60 ++++++++++++++++++++++++++++------------
2 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index af789f4..a3f48fa 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -143,7 +143,7 @@ IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow
inherit ${IMAGE_TYPE_vm}
python () {
- deps = " " + imagetypes_getdepends(d)
+ deps = " " + image_getdepends(d)
d.appendVarFlag('do_rootfs', 'depends', deps)
deps = ""
@@ -354,19 +354,6 @@ python () {
ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
old_overrides = d.getVar('OVERRIDES', 0)
- def _image_base_type(type):
- basetype = type
- for ctype in ctypes:
- if type.endswith("." + ctype):
- basetype = type[:-len("." + ctype)]
- break
-
- if basetype != type:
- # New base type itself might be generated by a conversion command.
- basetype = _image_base_type(basetype)
-
- return basetype
-
basetypes = {}
alltypes = d.getVar('IMAGE_FSTYPES', True).split()
typedeps = {}
@@ -377,7 +364,7 @@ python () {
alltypes.append("debugfs_" + t)
def _add_type(t):
- baset = _image_base_type(t)
+ baset = image_split_type(t, ctypes)[0]
input_t = t
if baset not in basetypes:
basetypes[baset]= []
@@ -396,7 +383,7 @@ python () {
if dep not in alltypes:
alltypes.append(dep)
_add_type(dep)
- basedep = _image_base_type(dep)
+ basedep = image_split_type(dep, ctypes)[0]
typedeps[baset].add(basedep)
if baset != input_t:
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 2b97397..c24df8f 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -9,30 +9,47 @@ IMAGE_NAME_SUFFIX ??= ".rootfs"
# set this value to 2048 (2MiB alignment).
IMAGE_ROOTFS_ALIGNMENT ?= "1"
-def imagetypes_getdepends(d):
- def adddep(depstr, deps):
- for d in (depstr or "").split():
- # Add task dependency if not already present
- if ":" not in d:
- d += ":do_populate_sysroot"
- deps.add(d)
+def image_split_type(type, allctypes):
+ '''Returns (basetype, set of compression types in use).'''
+ basetype = type
+ compressiontypes = set()
+ for ctype in allctypes:
+ if type.endswith("." + ctype):
+ basetype = type[:-len("." + ctype)]
+ compressiontypes.add(ctype)
+ break
- fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split())
- fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or "").split())
+ if basetype != type:
+ # New base type itself might be generated by a conversion command.
+ basetype, newctypes = image_split_type(basetype, allctypes)
+ compressiontypes.update(newctypes)
- deps = set()
- for typestring in fstypes:
- types = typestring.split(".")
- basetype, resttypes = types[0], types[1:]
+ return (basetype, compressiontypes)
- adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps)
+
+def image_getdepends(d):
+ def adddep(depstr, deps):
+ # It is not an error if the dependency was not set,
+ # simply do nothing in that case.
+ for i in (depstr or "").split():
+ if i not in deps:
+ deps.append(i)
+
+ deps = []
+ ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
+ for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
+ basetype, compressiontypes = image_split_type(type, ctypes)
+ for ctype in compressiontypes:
+ adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps)
for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split():
adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps)
- for ctype in resttypes:
- adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps)
+ adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps)
+
+ depstr = ""
+ for dep in deps:
+ depstr += " " + dep + ":do_populate_sysroot"
+ return depstr
- # Sort the set so that ordering is consistant
- return " ".join(sorted(deps))
XZ_COMPRESSION_LEVEL ?= "-3"
XZ_INTEGRITY_CHECK ?= "crc32"
@@ -294,6 +311,13 @@ IMAGE_DEPENDS_ubifs = "mtd-utils-native"
IMAGE_DEPENDS_multiubi = "mtd-utils-native"
IMAGE_DEPENDS_wic = "parted-native"
+# Same dependencies as in ext4. image_getdepends() shouldn't
+# have to hard-code this, so just define it normally in
+# variables.
+IMAGE_DEPENDS_live = "${IMAGE_DEPENDS_ext4}"
+IMAGE_DEPENDS_iso = "${IMAGE_DEPENDS_ext4}"
+IMAGE_DEPENDS_hddimg = "${IMAGE_DEPENDS_ext4}"
+
# This variable is available to request which values are suitable for IMAGE_FSTYPES
IMAGE_TYPES = " \
jffs2 jffs2.sum \
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining
2016-07-27 12:51 ` [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining Ed Bartosh
@ 2016-07-28 20:42 ` Richard Purdie
2016-07-29 8:22 ` Ed Bartosh
2016-07-28 20:51 ` Richard Purdie
1 sibling, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2016-07-28 20:42 UTC (permalink / raw)
To: Ed Bartosh, openembedded-core, Patrick Ohly
On Wed, 2016-07-27 at 15:51 +0300, Ed Bartosh wrote:
> From: Patrick Ohly <patrick.ohly@intel.com>
>
> When using conversion chaining (for example example: .dsk.vdi.xz),
> the imagetypes_getdepends() did not properly detect all compression
> commands (thus skipping the corresponding COMPRESS_DEPENDS) and
> the base type, leading to missing dependencies of the image's
> do_rootfs
> task.
>
> This is not a big problem in practice because in those cases where
> conversion chaining is useful (as in the example above), the missing
> dependency is qemu-native, which typically gets built anyway.
>
> imagetypes_getdepends() had hard-coded special treatment for certain
> image types. This gets replaced with setting the normal IMAGE_DEPENDS
> variables for these types.
>
> [YOCTO #9076]
>
> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
This patch has come in multiple times and each time I look at it I ask
that it be checked against changes that happened in parallel since I
believe there is something "not right" in the merge. Its not an easy
one to review as it makes several different kinds of changes.
I just spent a while comparing the changes and it removes the reference
to IMAGE_FSTYPES_DEBUGFS so I do believe this patch *does* cause at
least one regression. Whether there are other issues its really hard to
say.
Can someone try and perhaps make the diff more obvious and split it up?
Cheers,
Richard
> ---
> meta/classes/image.bbclass | 19 ++-----------
> meta/classes/image_types.bbclass | 60 ++++++++++++++++++++++++++++--
> ----------
> 2 files changed, 45 insertions(+), 34 deletions(-)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index af789f4..a3f48fa 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -143,7 +143,7 @@ IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_
> FSTYPES", ["vmdk", "vdi", "qcow
> inherit ${IMAGE_TYPE_vm}
>
> python () {
> - deps = " " + imagetypes_getdepends(d)
> + deps = " " + image_getdepends(d)
> d.appendVarFlag('do_rootfs', 'depends', deps)
>
> deps = ""
> @@ -354,19 +354,6 @@ python () {
> ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
> old_overrides = d.getVar('OVERRIDES', 0)
>
> - def _image_base_type(type):
> - basetype = type
> - for ctype in ctypes:
> - if type.endswith("." + ctype):
> - basetype = type[:-len("." + ctype)]
> - break
> -
> - if basetype != type:
> - # New base type itself might be generated by a
> conversion command.
> - basetype = _image_base_type(basetype)
> -
> - return basetype
> -
> basetypes = {}
> alltypes = d.getVar('IMAGE_FSTYPES', True).split()
> typedeps = {}
> @@ -377,7 +364,7 @@ python () {
> alltypes.append("debugfs_" + t)
>
> def _add_type(t):
> - baset = _image_base_type(t)
> + baset = image_split_type(t, ctypes)[0]
> input_t = t
> if baset not in basetypes:
> basetypes[baset]= []
> @@ -396,7 +383,7 @@ python () {
> if dep not in alltypes:
> alltypes.append(dep)
> _add_type(dep)
> - basedep = _image_base_type(dep)
> + basedep = image_split_type(dep, ctypes)[0]
> typedeps[baset].add(basedep)
>
> if baset != input_t:
> diff --git a/meta/classes/image_types.bbclass
> b/meta/classes/image_types.bbclass
> index 2b97397..c24df8f 100644
> --- a/meta/classes/image_types.bbclass
> +++ b/meta/classes/image_types.bbclass
> @@ -9,30 +9,47 @@ IMAGE_NAME_SUFFIX ??= ".rootfs"
> # set this value to 2048 (2MiB alignment).
> IMAGE_ROOTFS_ALIGNMENT ?= "1"
>
> -def imagetypes_getdepends(d):
> - def adddep(depstr, deps):
> - for d in (depstr or "").split():
> - # Add task dependency if not already present
> - if ":" not in d:
> - d += ":do_populate_sysroot"
> - deps.add(d)
> +def image_split_type(type, allctypes):
> + '''Returns (basetype, set of compression types in use).'''
> + basetype = type
> + compressiontypes = set()
> + for ctype in allctypes:
> + if type.endswith("." + ctype):
> + basetype = type[:-len("." + ctype)]
> + compressiontypes.add(ctype)
> + break
>
> - fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split())
> - fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or
> "").split())
> + if basetype != type:
> + # New base type itself might be generated by a conversion
> command.
> + basetype, newctypes = image_split_type(basetype, allctypes)
> + compressiontypes.update(newctypes)
>
> - deps = set()
> - for typestring in fstypes:
> - types = typestring.split(".")
> - basetype, resttypes = types[0], types[1:]
> + return (basetype, compressiontypes)
>
> - adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps)
> +
> +def image_getdepends(d):
> + def adddep(depstr, deps):
> + # It is not an error if the dependency was not set,
> + # simply do nothing in that case.
> + for i in (depstr or "").split():
> + if i not in deps:
> + deps.append(i)
> +
> + deps = []
> + ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
> + for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
> + basetype, compressiontypes = image_split_type(type, ctypes)
> + for ctype in compressiontypes:
> + adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True),
> deps)
> for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype,
> True) or "").split():
> adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True)
> , deps)
> - for ctype in resttypes:
> - adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True),
> deps)
> + adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps)
> +
> + depstr = ""
> + for dep in deps:
> + depstr += " " + dep + ":do_populate_sysroot"
> + return depstr
>
> - # Sort the set so that ordering is consistant
> - return " ".join(sorted(deps))
>
> XZ_COMPRESSION_LEVEL ?= "-3"
> XZ_INTEGRITY_CHECK ?= "crc32"
> @@ -294,6 +311,13 @@ IMAGE_DEPENDS_ubifs = "mtd-utils-native"
> IMAGE_DEPENDS_multiubi = "mtd-utils-native"
> IMAGE_DEPENDS_wic = "parted-native"
>
> +# Same dependencies as in ext4. image_getdepends() shouldn't
> +# have to hard-code this, so just define it normally in
> +# variables.
> +IMAGE_DEPENDS_live = "${IMAGE_DEPENDS_ext4}"
> +IMAGE_DEPENDS_iso = "${IMAGE_DEPENDS_ext4}"
> +IMAGE_DEPENDS_hddimg = "${IMAGE_DEPENDS_ext4}"
> +
> # This variable is available to request which values are suitable
> for IMAGE_FSTYPES
> IMAGE_TYPES = " \
> jffs2 jffs2.sum \
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining
2016-07-28 20:42 ` Richard Purdie
@ 2016-07-29 8:22 ` Ed Bartosh
0 siblings, 0 replies; 8+ messages in thread
From: Ed Bartosh @ 2016-07-29 8:22 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Thu, Jul 28, 2016 at 09:42:44PM +0100, Richard Purdie wrote:
> On Wed, 2016-07-27 at 15:51 +0300, Ed Bartosh wrote:
> > From: Patrick Ohly <patrick.ohly@intel.com>
> >
> > When using conversion chaining (for example example: .dsk.vdi.xz),
> > the imagetypes_getdepends() did not properly detect all compression
> > commands (thus skipping the corresponding COMPRESS_DEPENDS) and
> > the base type, leading to missing dependencies of the image's
> > do_rootfs
> > task.
> >
> > This is not a big problem in practice because in those cases where
> > conversion chaining is useful (as in the example above), the missing
> > dependency is qemu-native, which typically gets built anyway.
> >
> > imagetypes_getdepends() had hard-coded special treatment for certain
> > image types. This gets replaced with setting the normal IMAGE_DEPENDS
> > variables for these types.
> >
> > [YOCTO #9076]
> >
> > Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> > Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>
> This patch has come in multiple times and each time I look at it I ask
> that it be checked against changes that happened in parallel since I
> believe there is something "not right" in the merge. Its not an easy
> one to review as it makes several different kinds of changes.
>
> I just spent a while comparing the changes and it removes the reference
> to IMAGE_FSTYPES_DEBUGFS so I do believe this patch *does* cause at
> least one regression. Whether there are other issues its really hard to
> say.
>
> Can someone try and perhaps make the diff more obvious and split it up?
>
Thank you for the review.
I'll try to split this patch later. For now I'm going to remove it from
the patchset.
--
Regards,
Ed
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining
2016-07-27 12:51 ` [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining Ed Bartosh
2016-07-28 20:42 ` Richard Purdie
@ 2016-07-28 20:51 ` Richard Purdie
1 sibling, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2016-07-28 20:51 UTC (permalink / raw)
To: Ed Bartosh, openembedded-core, Patrick Ohly
On Wed, 2016-07-27 at 15:51 +0300, Ed Bartosh wrote:
> From: Patrick Ohly <patrick.ohly@intel.com>
>
> When using conversion chaining (for example example: .dsk.vdi.xz),
> the imagetypes_getdepends() did not properly detect all compression
> commands (thus skipping the corresponding COMPRESS_DEPENDS) and
> the base type, leading to missing dependencies of the image's
> do_rootfs
> task.
>
> This is not a big problem in practice because in those cases where
> conversion chaining is useful (as in the example above), the missing
> dependency is qemu-native, which typically gets built anyway.
>
> imagetypes_getdepends() had hard-coded special treatment for certain
> image types. This gets replaced with setting the normal IMAGE_DEPENDS
> variables for these types.
Also, where is this hardcoding? I can't see it in the patch.
Perhaps http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=b567235c0c
e427e2cd478a0268a295c74208e917 fixed this already?
Just makes me all the more suspicious of this patch...
Cheers,
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/4] image creation: support converting masked types
2016-07-27 12:51 [PATCH v4 0/4] image creation improvements Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining Ed Bartosh
@ 2016-07-27 12:51 ` Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 3/4] image.bbclass: rename COMPRESS(ION) to CONVERSION Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 4/4] image.bbclass: prefer specialized image creation methods over chaining Ed Bartosh
3 siblings, 0 replies; 8+ messages in thread
From: Ed Bartosh @ 2016-07-27 12:51 UTC (permalink / raw)
To: openembedded-core
From: Patrick Ohly <patrick.ohly@intel.com>
Conversion to vmdk/vdi/qcow2 is also useful for other base images
types, not just for .hdddirect. This can be achieved by definining
them as conversion commands and relying on the conversion chaining
to convert arbitrary base images.
For this to work when the base image gets created by a masked image
type, the additional conversion commands now get executed in a
do_image_complete prefunc.
With all of that in place it becomes possible to remove the special
purpose code for vmdk/vdi/qcow2 types from image-vm.bbclass and
several other classes. This has (intentional!) implications on the
valid IMAGE_FSTYPES and the file suffices: now
"hdddirect.vmdk/vdi/qcow2" must be used as IMAGE_FSTYPES to select the
former special-case types "vmdk/vdi/qcow2", and the image files and
links will also have the extra .hdddirect suffix.
This is intentional because it makes it makes it possible to
distinguish between virtual machine images created from .hdddirect and
those created from other base images.
The new support for virtual machine images can also be combined with
compression, thus making it possible to create image files for
publication in compressed format, for example with:
IMAGE_FSTYPES = "hdddirect.vdi.xz"
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image-live.bbclass | 2 +-
meta/classes/image-vm.bbclass | 33 ++--------
meta/classes/image.bbclass | 73 +++++++++++++++-------
meta/classes/image_types.bbclass | 20 ++++--
meta/conf/documentation.conf | 1 -
.../images/build-appliance-image_15.0.0.bb | 6 +-
6 files changed, 75 insertions(+), 60 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index f0e6647..039a977 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -43,7 +43,7 @@ ROOT_LIVE ?= "root=/dev/ram0"
INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext4"
IMAGE_TYPEDEP_live = "ext4"
IMAGE_TYPEDEP_iso = "ext4"
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 72f7b4b..d37ce0a 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -26,14 +26,11 @@ do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
${PN}:do_image_${VM_ROOTFS_TYPE} \
"
-IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}"
+VM_ROOTFS_TYPE ?= "ext4"
IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
+IMAGE_TYPES_MASKED += "hdddirect"
-VM_ROOTFS_TYPE ?= "ext4"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext4"
# Used by bootloader
LABELS_VM ?= "boot"
@@ -144,27 +141,5 @@ run_qemu_img (){
qemu-img convert -O $type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.$type
ln -sf ${IMAGE_NAME}.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
}
-create_vmdk_image () {
- run_qemu_img vmdk
-}
-
-create_vdi_image () {
- run_qemu_img vdi
-}
-
-create_qcow2_image () {
- run_qemu_img qcow2
-}
-
-python do_vmimg() {
- if 'vmdk' in d.getVar('IMAGE_FSTYPES', True):
- bb.build.exec_func('create_vmdk_image', d)
- if 'vdi' in d.getVar('IMAGE_FSTYPES', True):
- bb.build.exec_func('create_vdi_image', d)
- if 'qcow2' in d.getVar('IMAGE_FSTYPES', True):
- bb.build.exec_func('create_qcow2_image', d)
-}
-addtask bootdirectdisk before do_vmimg
-addtask vmimg after do_bootdirectdisk before do_image_complete
-do_vmimg[depends] += "qemu-native:do_populate_sysroot"
+addtask bootdirectdisk before do_image_complete
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index a3f48fa..406b9e0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -127,6 +127,13 @@ do_rootfs[vardeps] += "${@rootfs_variables(d)}"
do_build[depends] += "virtual/kernel:do_deploy"
+def image_type_active(type, d):
+ '''True if any entry in IMAGE_FSTYPES is type or depends on it.'''
+ for entry in d.getVar("IMAGE_FSTYPES", True).split():
+ if entry == type or entry.startswith(type + "."):
+ return True
+ return False
+
def build_live(d):
if bb.utils.contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg
d.setVar('NOISO', bb.utils.contains('IMAGE_FSTYPES', "iso", "0", "1", d))
@@ -139,7 +146,7 @@ def build_live(d):
IMAGE_TYPE_live = "${@build_live(d)}"
inherit ${IMAGE_TYPE_live}
-IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2", "hdddirect"], "image-vm", "", d)}'
+IMAGE_TYPE_vm = '${@ "image-vm" if image_type_active("hdddirect", d) else ""}'
inherit ${IMAGE_TYPE_vm}
python () {
@@ -401,9 +408,7 @@ python () {
cmds = []
subimages = []
realt = t
-
- if t in maskedtypes:
- continue
+ ismasked = t in maskedtypes
localdata = bb.data.createCopy(d)
debug = ""
@@ -421,12 +426,14 @@ python () {
localdata.delVar('DATETIME')
localdata.delVar('TMPDIR')
- image_cmd = localdata.getVar("IMAGE_CMD", True)
- vardeps.add('IMAGE_CMD_' + realt)
- if image_cmd:
- cmds.append("\t" + image_cmd)
- else:
- bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t)
+ if not ismasked:
+ image_cmd = localdata.getVar("IMAGE_CMD", True)
+ vardeps.add('IMAGE_CMD_' + realt)
+ if image_cmd:
+ cmds.append("\t" + image_cmd)
+ else:
+ bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t)
+
cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
# Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx,
@@ -474,17 +481,41 @@ python () {
t = t.replace("-", "_").replace(".", "_")
- d.setVar('do_image_%s' % t, '\n'.join(cmds))
- d.setVarFlag('do_image_%s' % t, 'func', '1')
- d.setVarFlag('do_image_%s' % t, 'fakeroot', '1')
- d.setVarFlag('do_image_%s' % t, 'prefuncs', debug + 'set_image_size')
- d.setVarFlag('do_image_%s' % t, 'postfuncs', 'create_symlinks')
- d.setVarFlag('do_image_%s' % t, 'subimages', ' '.join(subimages))
- d.appendVarFlag('do_image_%s' % t, 'vardeps', ' '.join(vardeps))
- d.appendVarFlag('do_image_%s' % t, 'vardepsexclude', 'DATETIME')
-
- bb.debug(2, "Adding type %s before %s, after %s" % (t, 'do_image_complete', after))
- bb.build.addtask('do_image_%s' % t, 'do_image_complete', after, d)
+ if ismasked:
+ # If the type is masked, then some unknown task (for example,
+ # do_bootdirectdisk in boot-directdisk.bbclass for IMAGE_FSTYPES hdddirect)
+ # will create the actual base image. All we know is that the files will
+ # be there right before do_image_complete. So in that case we put the
+ # conversion commands into a do_image_complete prefunc. The 'after'
+ # dependencies can be ignored because we are guaranteed to run after
+ # all of them, and the conversion dependencies are dealt with
+ # by making do_rootfs depend on them.
+ d.setVar('image_%s_conversion' % t, '\n'.join(cmds))
+ d.setVarFlag('image_%s_conversion' % t, 'func', '1')
+ d.setVarFlag('image_%s_conversion' % t, 'fakeroot', '1')
+ d.appendVarFlag('image_%s_conversion' % t, 'vardeps', ' '.join(vardeps))
+ d.appendVarFlag('image_%s_conversion' % t, 'vardepsexclude', 'DATETIME')
+ prefuncs = set((d.getVarFlag('do_image_complete', 'prefuncs', True) or '').split())
+ prefuncs.add('image_%s_conversion' % t)
+ # create_symlinks must run after the commands which create the real files
+ # because create_symlinks checks for them.
+ prefuncs.discard('create_symlinks')
+ d.setVarFlag('do_image_complete', 'prefuncs', ' '.join(sorted(prefuncs)) + ' create_symlinks')
+ d.appendVarFlag('do_image_complete', 'subimages', ' ' + ' '.join(subimages))
+ else:
+ # If not masked, we generate a new task which executes the image
+ # creation and the conversion commands.
+ d.setVar('do_image_%s' % t, '\n'.join(cmds))
+ d.setVarFlag('do_image_%s' % t, 'func', '1')
+ d.setVarFlag('do_image_%s' % t, 'fakeroot', '1')
+ d.setVarFlag('do_image_%s' % t, 'prefuncs', debug + 'set_image_size')
+ d.setVarFlag('do_image_%s' % t, 'postfuncs', 'create_symlinks')
+ d.setVarFlag('do_image_%s' % t, 'subimages', ' '.join(subimages))
+ d.appendVarFlag('do_image_%s' % t, 'vardeps', ' '.join(vardeps))
+ d.appendVarFlag('do_image_%s' % t, 'vardepsexclude', 'DATETIME')
+
+ bb.debug(2, "Adding type %s before %s, after %s" % (t, 'do_image_complete', after))
+ bb.build.addtask('do_image_%s' % t, 'do_image_complete', after, d)
}
#
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index c24df8f..b5092cf 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -301,6 +301,7 @@ IMAGE_DEPENDS_cramfs = "util-linux-native"
IMAGE_DEPENDS_ext2 = "e2fsprogs-native"
IMAGE_DEPENDS_ext3 = "e2fsprogs-native"
IMAGE_DEPENDS_ext4 = "e2fsprogs-native"
+IMAGE_DEPENDS_hdddirect = "${IMAGE_DEPENDS_ext4}"
IMAGE_DEPENDS_btrfs = "btrfs-tools-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
IMAGE_DEPENDS_squashfs-xz = "squashfs-tools-native"
@@ -319,6 +320,9 @@ IMAGE_DEPENDS_iso = "${IMAGE_DEPENDS_ext4}"
IMAGE_DEPENDS_hddimg = "${IMAGE_DEPENDS_ext4}"
# This variable is available to request which values are suitable for IMAGE_FSTYPES
+# TODO: several other variations are now also possible, for example ext4.zip,
+# hdddirect.xz, hdddirect.vdi.xz. Which variations are supposed to be listed here
+# and which not? Generate all possible variations dynamically?
IMAGE_TYPES = " \
jffs2 jffs2.sum \
cramfs \
@@ -332,15 +336,15 @@ IMAGE_TYPES = " \
ubi ubifs multiubi \
tar tar.gz tar.bz2 tar.xz tar.lz4 \
cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 \
- vmdk \
- vdi \
- qcow2 \
+ hdddirect.vmdk \
+ hdddirect.vdi \
+ hdddirect.qcow2 \
hdddirect \
elf \
wic wic.gz wic.bz2 wic.lzma \
"
-COMPRESSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap"
+COMPRESSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap vmdk vdi qcow2"
COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
COMPRESS_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
@@ -348,6 +352,9 @@ COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${X
COMPRESS_CMD_lz4 = "lz4c -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.lz4"
COMPRESS_CMD_zip = "zip ${ZIP_COMPRESSION_LEVEL} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zip ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
COMPRESS_CMD_sum = "sumtool -i ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sum ${JFFS2_SUM_EXTRA_ARGS}"
+COMPRESS_CMD_vmdk = "qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk"
+COMPRESS_CMD_vdi = "qemu-img convert -O vdi ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi"
+COMPRESS_CMD_qcow2 = "qemu-img convert -O qcow2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2"
COMPRESS_CMD_md5sum = "md5sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.md5sum"
COMPRESS_CMD_sha1sum = "sha1sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha1sum"
COMPRESS_CMD_sha224sum = "sha224sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha224sum"
@@ -363,6 +370,9 @@ COMPRESS_DEPENDS_lz4 = "lz4-native"
COMPRESS_DEPENDS_zip = "zip-native"
COMPRESS_DEPENDS_sum = "mtd-utils-native"
COMPRESS_DEPENDS_bmap = "bmap-tools-native"
+COMPRESS_DEPENDS_vmdk = "qemu-native"
+COMPRESS_DEPENDS_vdi = "qemu-native"
+COMPRESS_DEPENDS_qcow2 = "qemu-native"
RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4"
RUNNABLE_MACHINE_PATTERNS ?= "qemu"
@@ -373,7 +383,7 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
IMAGE_EXTENSION_live = "hddimg iso"
# The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES,
-# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hdddirect, hddimg, iso, etc.
+# images that will not be built at do_rootfs time: hdddirect, hddimg, iso, etc.
IMAGE_TYPES_MASKED ?= ""
# The WICVARS variable is used to define list of bitbake variables used in wic code
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 51c4116..35e487c 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -56,7 +56,6 @@ do_testsdk[doc] = "Installs an SDK and performs runtime tests on the tools insta
do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader"
do_unpack[doc] = "Unpacks the source code into a working directory"
do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their SRCREV values for a linux-yocto style kernel"
-do_vmimg[doc] = "Creates an image for use with VMware or VirtualBox compatible virtual machine hosts (based on IMAGE_FSTYPES either .vmdk or .vdi)"
# DESCRIPTIONS FOR VARIABLES #
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index dc621d6..957b8cf 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -18,7 +18,7 @@ IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
APPEND += "rootfstype=ext4 quiet"
DEPENDS = "zip-native"
-IMAGE_FSTYPES = "vmdk"
+IMAGE_FSTYPES = "hdddirect.vmdk"
inherit core-image module-base
@@ -101,7 +101,7 @@ create_bundle_files () {
cd ${WORKDIR}
mkdir -p Yocto_Build_Appliance
cp *.vmx* Yocto_Build_Appliance
- ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk
+ ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk
zip -r ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance
ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance.zip
}
@@ -111,5 +111,5 @@ python do_bundle_files() {
bb.build.exec_func('create_bundle_files', d)
}
-addtask bundle_files after do_vmimg before do_build
+addtask bundle_files after do_image_complete before do_build
do_bundle_files[nostamp] = "1"
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v4 3/4] image.bbclass: rename COMPRESS(ION) to CONVERSION
2016-07-27 12:51 [PATCH v4 0/4] image creation improvements Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 1/4] image.bbclass: fix dependency calculation when using conversion chaining Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 2/4] image creation: support converting masked types Ed Bartosh
@ 2016-07-27 12:51 ` Ed Bartosh
2016-07-27 12:51 ` [PATCH v4 4/4] image.bbclass: prefer specialized image creation methods over chaining Ed Bartosh
3 siblings, 0 replies; 8+ messages in thread
From: Ed Bartosh @ 2016-07-27 12:51 UTC (permalink / raw)
To: openembedded-core
From: Patrick Ohly <patrick.ohly@intel.com>
With the enhanced functionality, the term "compression" is no longer
accurate, because the mechanism also gets used for conversion
operations that do not actually compress data.
It is possible to remove this naming problem in a backward-compatible
manner by including COMPRESSIONTYPES in CONVERSIONTYPES and checking for
the old COMPRESS_CMD/DEPENDS as fallbacks.
[YOCTO #9346]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image.bbclass | 10 +++---
meta/classes/image_types.bbclass | 64 +++++++++++++++++-----------------
meta/classes/image_types_uboot.bbclass | 18 +++++-----
3 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 406b9e0..5edbca1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -118,7 +118,7 @@ def rootfs_variables(d):
'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
- 'COMPRESSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED']
+ 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED']
variables.extend(rootfs_command_variables(d))
variables.extend(variable_depends(d))
return " ".join(variables)
@@ -149,6 +149,7 @@ inherit ${IMAGE_TYPE_live}
IMAGE_TYPE_vm = '${@ "image-vm" if image_type_active("hdddirect", d) else ""}'
inherit ${IMAGE_TYPE_vm}
+
python () {
deps = " " + image_getdepends(d)
d.appendVarFlag('do_rootfs', 'depends', deps)
@@ -350,7 +351,7 @@ python setup_debugfs () {
python () {
vardeps = set()
- # We allow COMPRESSIONTYPES to have duplicates. That avoids breaking
+ # We allow CONVERSIONTYPES to have duplicates. That avoids breaking
# derived distros when OE-core or some other layer independently adds
# the same type. There is still only one command for each type, but
# presumably the commands will do the same when the type is the same,
@@ -358,7 +359,7 @@ python () {
#
# Without de-duplication, gen_conversion_cmds() below
# would create the same compression command multiple times.
- ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
+ ctypes = set(d.getVar('CONVERSIONTYPES', True).split())
old_overrides = d.getVar('OVERRIDES', 0)
basetypes = {}
@@ -450,9 +451,10 @@ python () {
# Create input image first.
gen_conversion_cmds(type)
localdata.setVar('type', type)
- cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)
+ cmd = "\t" + (localdata.getVar("CONVERSION_CMD_" + ctype, True) or localdata.getVar("COMPRESS_CMD_" + ctype, True))
if cmd not in cmds:
cmds.append(cmd)
+ vardeps.add('CONVERSION_CMD_' + ctype)
vardeps.add('COMPRESS_CMD_' + ctype)
subimage = type + "." + ctype
if subimage not in subimages:
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index b5092cf..e632fd1 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -36,11 +36,11 @@ def image_getdepends(d):
deps.append(i)
deps = []
- ctypes = set(d.getVar('COMPRESSIONTYPES', True).split())
+ ctypes = set(d.getVar('CONVERSIONTYPES', True).split())
for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
basetype, compressiontypes = image_split_type(type, ctypes)
for ctype in compressiontypes:
- adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps)
+ adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps)
for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split():
adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps)
adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps)
@@ -231,7 +231,7 @@ IMAGE_CMD_wic () {
IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"
# Rebuild when the wks file or vars in WICVARS change
-USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}"
+USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}"
WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}"
@@ -344,35 +344,35 @@ IMAGE_TYPES = " \
wic wic.gz wic.bz2 wic.lzma \
"
-COMPRESSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap vmdk vdi qcow2"
-COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
-COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
-COMPRESS_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
-COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.xz"
-COMPRESS_CMD_lz4 = "lz4c -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.lz4"
-COMPRESS_CMD_zip = "zip ${ZIP_COMPRESSION_LEVEL} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zip ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
-COMPRESS_CMD_sum = "sumtool -i ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sum ${JFFS2_SUM_EXTRA_ARGS}"
-COMPRESS_CMD_vmdk = "qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk"
-COMPRESS_CMD_vdi = "qemu-img convert -O vdi ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi"
-COMPRESS_CMD_qcow2 = "qemu-img convert -O qcow2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2"
-COMPRESS_CMD_md5sum = "md5sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.md5sum"
-COMPRESS_CMD_sha1sum = "sha1sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha1sum"
-COMPRESS_CMD_sha224sum = "sha224sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha224sum"
-COMPRESS_CMD_sha256sum = "sha256sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha256sum"
-COMPRESS_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum"
-COMPRESS_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum"
-COMPRESS_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap"
-COMPRESS_DEPENDS_lzma = "xz-native"
-COMPRESS_DEPENDS_gz = ""
-COMPRESS_DEPENDS_bz2 = "pbzip2-native"
-COMPRESS_DEPENDS_xz = "xz-native"
-COMPRESS_DEPENDS_lz4 = "lz4-native"
-COMPRESS_DEPENDS_zip = "zip-native"
-COMPRESS_DEPENDS_sum = "mtd-utils-native"
-COMPRESS_DEPENDS_bmap = "bmap-tools-native"
-COMPRESS_DEPENDS_vmdk = "qemu-native"
-COMPRESS_DEPENDS_vdi = "qemu-native"
-COMPRESS_DEPENDS_qcow2 = "qemu-native"
+CONVERSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap vmdk vdi qcow2"
+CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
+CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
+CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
+CONVERSION_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.xz"
+CONVERSION_CMD_lz4 = "lz4c -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.lz4"
+CONVERSION_CMD_zip = "zip ${ZIP_COMPRESSION_LEVEL} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zip ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
+CONVERSION_CMD_sum = "sumtool -i ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sum ${JFFS2_SUM_EXTRA_ARGS}"
+CONVERSION_CMD_vmdk = "qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk"
+CONVERSION_CMD_vdi = "qemu-img convert -O vdi ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi"
+CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2"
+CONVERSION_CMD_md5sum = "md5sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.md5sum"
+CONVERSION_CMD_sha1sum = "sha1sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha1sum"
+CONVERSION_CMD_sha224sum = "sha224sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha224sum"
+CONVERSION_CMD_sha256sum = "sha256sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha256sum"
+CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum"
+CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum"
+CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap"
+CONVERSION_DEPENDS_lzma = "xz-native"
+CONVERSION_DEPENDS_gz = ""
+CONVERSION_DEPENDS_bz2 = "pbzip2-native"
+CONVERSION_DEPENDS_xz = "xz-native"
+CONVERSION_DEPENDS_lz4 = "lz4-native"
+CONVERSION_DEPENDS_zip = "zip-native"
+CONVERSION_DEPENDS_sum = "mtd-utils-native"
+CONVERSION_DEPENDS_bmap = "bmap-tools-native"
+CONVERSION_DEPENDS_vmdk = "qemu-native"
+CONVERSION_DEPENDS_vdi = "qemu-native"
+CONVERSION_DEPENDS_qcow2 = "qemu-native"
RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4"
RUNNABLE_MACHINE_PATTERNS ?= "qemu"
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 19e4aa2..f72d9b2 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -8,19 +8,19 @@ oe_mkimage () {
fi
}
-COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
+CONVERSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
-COMPRESS_DEPENDS_u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
+CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
+CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
-COMPRESS_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_gz.u-boot = "${COMPRESS_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip clean"
+CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
+CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip clean"
-COMPRESS_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_bz2.u-boot = "${COMPRESS_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean"
+CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
+CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean"
-COMPRESS_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_lzma.u-boot = "${COMPRESS_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean"
+CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
+CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean"
IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot cpio.gz.u-boot"
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v4 4/4] image.bbclass: prefer specialized image creation methods over chaining
2016-07-27 12:51 [PATCH v4 0/4] image creation improvements Ed Bartosh
` (2 preceding siblings ...)
2016-07-27 12:51 ` [PATCH v4 3/4] image.bbclass: rename COMPRESS(ION) to CONVERSION Ed Bartosh
@ 2016-07-27 12:51 ` Ed Bartosh
3 siblings, 0 replies; 8+ messages in thread
From: Ed Bartosh @ 2016-07-27 12:51 UTC (permalink / raw)
To: openembedded-core
From: Patrick Ohly <patrick.ohly@intel.com>
If a certain image type can be created both by applying conversion
commands to a base type as well as via a specialized command (like a
fictious IMAGE_CMD_ext4.xz, or some dedicated task, as indicated by
IMAGE_TYPES_MASKED = ext4.xz), then pick the more specialized method
and skip generating the conversion commands.
That way developers can choose between using the builtin conversion
support or re-implementing certain types, for example more efficiently
without intermediate files.
[YOCTO #9076]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image.bbclass | 21 +++++++++++++--------
meta/classes/image_types.bbclass | 16 +++++++++++++---
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5edbca1..d497747 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -372,7 +372,7 @@ python () {
alltypes.append("debugfs_" + t)
def _add_type(t):
- baset = image_split_type(t, ctypes)[0]
+ baset = image_split_type(t, ctypes, d)[0]
input_t = t
if baset not in basetypes:
basetypes[baset]= []
@@ -391,7 +391,7 @@ python () {
if dep not in alltypes:
alltypes.append(dep)
_add_type(dep)
- basedep = image_split_type(dep, ctypes)[0]
+ basedep = image_split_type(dep, ctypes, d)[0]
typedeps[baset].add(basedep)
if baset != input_t:
@@ -442,14 +442,17 @@ python () {
d.delVarFlag('IMAGE_CMD_' + realt, 'func')
rm_tmp_images = set()
- def gen_conversion_cmds(bt):
+ def gen_conversion_cmds(basetype, type):
+ if basetype == type:
+ # Done, no further conversions needed.
+ return
for ctype in ctypes:
- if bt[bt.find('.') + 1:] == ctype:
- type = bt[0:-len(ctype) - 1]
+ if type.endswith("." + ctype):
+ type = type[0:-len(ctype) - 1]
if type.startswith("debugfs_"):
type = type[8:]
# Create input image first.
- gen_conversion_cmds(type)
+ gen_conversion_cmds(basetype, type)
localdata.setVar('type', type)
cmd = "\t" + (localdata.getVar("CONVERSION_CMD_" + ctype, True) or localdata.getVar("COMPRESS_CMD_" + ctype, True))
if cmd not in cmds:
@@ -462,8 +465,10 @@ python () {
if type not in alltypes:
rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))
- for bt in basetypes[t]:
- gen_conversion_cmds(bt)
+ for type in basetypes[t]:
+ # Probably t == bt, but better check explicitly, perhaps that'll change.
+ bt = image_split_type(type, ctypes, d)[0]
+ gen_conversion_cmds(bt, type)
localdata.setVar('type', realt)
if t not in alltypes:
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index e632fd1..8a5346e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -9,10 +9,20 @@ IMAGE_NAME_SUFFIX ??= ".rootfs"
# set this value to 2048 (2MiB alignment).
IMAGE_ROOTFS_ALIGNMENT ?= "1"
-def image_split_type(type, allctypes):
+def image_split_type(type, allctypes, d):
'''Returns (basetype, set of compression types in use).'''
basetype = type
compressiontypes = set()
+
+ # Abort stripping the type further if "basetype" has a matching
+ # IMAGE_CMD or is a masked image type. For example, if there
+ # was a fictional IMAGE_CMD_ext4.xz which creates a compressed
+ # file directly, then we should use that instead of using
+ # IMAGE_CMD_ext4 + CONVERSION_CMD_xz.
+ if d.getVar('IMAGE_CMD_' + basetype, True) or \
+ basetype in d.getVar('IMAGE_TYPES_MASKED', True).split():
+ return (basetype, compressiontypes)
+
for ctype in allctypes:
if type.endswith("." + ctype):
basetype = type[:-len("." + ctype)]
@@ -21,7 +31,7 @@ def image_split_type(type, allctypes):
if basetype != type:
# New base type itself might be generated by a conversion command.
- basetype, newctypes = image_split_type(basetype, allctypes)
+ basetype, newctypes = image_split_type(basetype, allctypes, d)
compressiontypes.update(newctypes)
return (basetype, compressiontypes)
@@ -38,7 +48,7 @@ def image_getdepends(d):
deps = []
ctypes = set(d.getVar('CONVERSIONTYPES', True).split())
for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
- basetype, compressiontypes = image_split_type(type, ctypes)
+ basetype, compressiontypes = image_split_type(type, ctypes, d)
for ctype in compressiontypes:
adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps)
for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split():
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread