[OE-core] [PATCH v4] buildinfo.bblass: Added buildinfo class
Paul Eggleton
paul.eggleton at linux.intel.com
Fri Oct 31 16:38:53 UTC 2014
Hi Alejandro,
This looks much better as an implementation. Some comments below though.
On Thursday 30 October 2014 18:25:06 Alejandro Hernandez wrote:
> Writes build information to target filesystem on /etc/build, such as
>
> enabled layers, their current status and commit, squashspaces and outputvars
>
> functions moved from buidlhistory.bbclass to oe/utils.py, to be used by
>
> different classes and avoid code duplication.
>
> [YOCTO #6770]
>
> Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
> ---
> meta/classes/buildhistory.bbclass | 39 ++++++++--------------------
> meta/classes/buildinfo.bbclass | 53
> +++++++++++++++++++++++++++++++++++++++ meta/lib/oe/utils.py |
> 16 ++++++++++++
> 3 files changed, 80 insertions(+), 28 deletions(-)
> create mode 100644 meta/classes/buildinfo.bbclass
>
> diff --git a/meta/classes/buildhistory.bbclass
> b/meta/classes/buildhistory.bbclass index 8b5d5c2..3f87f08 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -155,7 +155,7 @@ python buildhistory_emit_pkghistory() {
> with open(os.path.join(pkgdata_dir, pn)) as f:
> for line in f.readlines():
> if line.startswith('PACKAGES: '):
> - packages = squashspaces(line.split(': ', 1)[1])
> + packages = oe.utils.squashspaces(line.split(': ',
> 1)[1]) break
> except IOError as e:
> if e.errno == errno.ENOENT:
> @@ -181,7 +181,7 @@ python buildhistory_emit_pkghistory() {
> rcpinfo.pe = pe
> rcpinfo.pv = pv
> rcpinfo.pr = pr
> - rcpinfo.depends = sortlist(squashspaces(d.getVar('DEPENDS', True) or
> "")) + rcpinfo.depends =
> sortlist(oe.utils.squashspaces(d.getVar('DEPENDS', True) or ""))
> rcpinfo.packages = packages
> write_recipehistory(rcpinfo, d)
>
> @@ -222,13 +222,13 @@ python buildhistory_emit_pkghistory() {
> pkginfo.pkge = pkge
> pkginfo.pkgv = pkgv
> pkginfo.pkgr = pkgr
> - pkginfo.rprovides =
> sortpkglist(squashspaces(pkgdata.get('RPROVIDES', ""))) -
> pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS', ""))) -
> pkginfo.rrecommends =
> sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS', ""))) -
> pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS', "")))
> - pkginfo.rreplaces =
> sortpkglist(squashspaces(pkgdata.get('RREPLACES', ""))) -
> pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS',
> ""))) - pkginfo.files = squashspaces(pkgdata.get('FILES', ""))
> + pkginfo.rprovides =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RPROVIDES', ""))) +
> pkginfo.rdepends =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RDEPENDS', ""))) +
> pkginfo.rrecommends =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RRECOMMENDS', ""))) +
> pkginfo.rsuggests =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RSUGGESTS', ""))) +
> pkginfo.rreplaces =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RREPLACES', ""))) +
> pkginfo.rconflicts =
> sortpkglist(oe.utils.squashspaces(pkgdata.get('RCONFLICTS', ""))) +
> pkginfo.files = oe.utils.squashspaces(pkgdata.get('FILES', "")) for filevar
> in pkginfo.filevars:
> pkginfo.filevars[filevar] = pkgdata.get(filevar, "")
>
> @@ -525,36 +525,19 @@ def buildhistory_get_metadata_revs(d):
> for i in layers]
> return '\n'.join(medadata_revs)
>
> -
> -def squashspaces(string):
> - import re
> - return re.sub("\s+", " ", string).strip()
> -
> -def outputvars(vars, listvars, d):
> - vars = vars.split()
> - listvars = listvars.split()
> - ret = ""
> - for var in vars:
> - value = d.getVar(var, True) or ""
> - if var in listvars:
> - # Squash out spaces
> - value = squashspaces(value)
> - ret += "%s = %s\n" % (var, value)
> - return ret.rstrip('\n')
I appreciate we generally want to avoid code duplication, but specifically for
outputvars() can we keep this implementation specific to buildhistory.bbclass?
If you need to copy it (or parts of it) to the new class by all means do, but
if we share it in oe.utils it means if we ever change the output format for
one it will be changed everywhere, which might not be desirable.
> def buildhistory_get_imagevars(d):
> if d.getVar('BB_WORKERCONTEXT', True) != '1':
> return ""
> imagevars = "DISTRO DISTRO_VERSION USER_CLASSES IMAGE_CLASSES
> IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS
> NO_RECOMMENDATIONS PACKAGE_EXCLUDE ROOTFS_POSTPROCESS_COMMAND
> IMAGE_POSTPROCESS_COMMAND" listvars = "USER_CLASSES IMAGE_CLASSES
> IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS
> PACKAGE_EXCLUDE" - return outputvars(imagevars, listvars, d)
> + return oe.utils.outputvars(imagevars, listvars, d)
>
> def buildhistory_get_sdkvars(d):
> if d.getVar('BB_WORKERCONTEXT', True) != '1':
> return ""
> sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE
> SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE"
> listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE" -
> return outputvars(sdkvars, listvars, d)
> + return oe.utils.outputvars(sdkvars, listvars, d)
>
>
> def buildhistory_get_cmdline(d):
> diff --git a/meta/classes/buildinfo.bbclass b/meta/classes/buildinfo.bbclass
> new file mode 100644
> index 0000000..a0220b2
> --- /dev/null
> +++ b/meta/classes/buildinfo.bbclass
Can you name this image-buildinfo.bbclass instead?
> @@ -0,0 +1,53 @@
> +#
> +# Writes build information to target filesystem
> +#
> +# Usage: add INHERIT += "buildinfo" to your conf file
> +#
> +# Copyright (C) 2014 Intel Corporation
> +# Author: Alejandro Enedino Hernandez Samaniego
> <alejandro.hernandez at intel.com> +#
> +# Licensed under the MIT license, see COPYING.MIT for details
> +#
> +
> +# Gets git branch's status (clean or dirty)
> +def get_layer_git_status(path):
> + f = os.popen("cd %s; git diff --stat 2>&1 | tail -n 1" % path)
> + data = f.read()
> + if f.close() is None:
> + if len(data) != 0:
> + return "-- modified"
> + return ""
> +
> +# Returns layer revisions along with their respective status
> +def get_layer_revs(d):
> + layers = (d.getVar("BBLAYERS", True) or "").split()
> + medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
> + base_get_metadata_git_branch(i, None).strip(), \
> + base_get_metadata_git_revision(i, None), \
> + get_layer_git_status(i)) \
> + for i in layers]
> + return '\n'.join(medadata_revs)
> +
> +def buildinfo_target(d):
> + # Get context
> + if d.getVar('BB_WORKERCONTEXT', True) != '1':
> + return ""
> + # Single and list variables to be read
> + vars = "DISTRO DISTRO_VERSION BB_VERSION BUILD_SYS TARGET_SYS
> MACHINE USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS
> IMAGE_INSTALL PACKAGE_EXCLUDE"
Could you set this from a variable (perhaps IMAGE_BUILDINFO_VARS) defaulted in
the class with ?= and be a bit more conservative as to the default value? I'd
say "DISTRO DISTRO_VERSION" would be a good as a default.
Thanks,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
More information about the Openembedded-core
mailing list