[OE-core] [PATCH 1/1] image.bbclass/rootfs.py: add variables to rootfs[vardeps]

[Burton, Ross]

On 18 July 2014 14:20, Roxana Ciobanu <roxana.ciobanu at intel.com> wrote:
> +def rootfs_variables(d):
> +    from oe.rootfs import variable_depends
> +    deps =  variable_depends(d)
> +    variables = "IMAGE_DEVICE_TABLES BUILD_IMAGES_FROM_FEEDS IMAGE_TYPEDEP_ IMAGE_TYPES_MASKED IMAGE_ROOTFS_ALIGNMENT
[snip]
NO_RECOMMENDATIONS PACKAGE_ARCHS PACKAGE_CLASSES "
> +    # keep line under 998 characters
> +    variables += "TARGET_VENDOR TARGET_VENDOR TARGET_ARCH TARGET_OS OVERRIDES BBEXTENDVARIANT FEED_DEPLOYDIR_BASE_URI INTERCEPT_DIR BUILDNAME USE_DEVFS STAGING_KERNEL_DIR COMPRESSIONTYPES"
> +    return ' '.join([variables, deps])

So a neater way of doing this would be to do:

  variables = ['BUILD_IMAGES_FROM_FEEDS', 'PACKAGE_ARCHS', (etc)]

This list can be wrapped appropriately so that it doesn't take up a
few pages and also isn't a single massive line.

Then add the variable from the rootfs with:

  variables.extend(variable_depends())
  return " ".join(variables)

> +def variable_depends(d, manifest_dir=None):
> +    img_type = d.getVar('IMAGE_PKGTYPE', True)
> +    cls = get_class_for_type(img_type)
> +    return " ".join(cls._depends_list())

If the above change happens then this should return the list, not a
joined string.

Ross