diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-02-08 09:18:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 14:34:14 +0000 |
| commit | 564d76bed7b96d381d6438df81c0d5b4f5a7b2b0 (patch) | |
| tree | b8e1831a04e25bbbdbfd355abbbdf05ff0e84cde | |
| parent | d20011571db96da79a8a0e056c6cef8e4c083608 (diff) | |
| download | openembedded-core-564d76bed7b96d381d6438df81c0d5b4f5a7b2b0.tar.gz openembedded-core-564d76bed7b96d381d6438df81c0d5b4f5a7b2b0.tar.bz2 openembedded-core-564d76bed7b96d381d6438df81c0d5b4f5a7b2b0.zip | |
buildhistory: record more R* variables
Add RPROVIDES, RREPLACES, RCONFLICTS and RSUGGESTS to the list of
tracked variables. Of these, RPROVIDES is always output, whereas the
others are only output if they have a value (since it is more common
that they don't).
Implements [YOCTO #3391].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index a6fbd68333..a20d03dae7 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -58,8 +58,12 @@ python buildhistory_emit_pkghistory() { self.pkgr = "" self.size = 0 self.depends = "" + self.rprovides = "" self.rdepends = "" self.rrecommends = "" + self.rsuggests = "" + self.rreplaces = "" + self.rconflicts = "" self.files = "" self.filelist = "" # Variables that need to be written to their own separate file @@ -96,10 +100,18 @@ python buildhistory_emit_pkghistory() { pkginfo.pkgv = value elif name == "PKGR": pkginfo.pkgr = value + elif name == "RPROVIDES": + pkginfo.rprovides = value elif name == "RDEPENDS": pkginfo.rdepends = value elif name == "RRECOMMENDS": pkginfo.rrecommends = value + elif name == "RSUGGESTS": + pkginfo.rsuggests = value + elif name == "RREPLACES": + pkginfo.rreplaces = value + elif name == "RCONFLICTS": + pkginfo.rconflicts = value elif name == "PKGSIZE": pkginfo.size = long(value) elif name == "FILES": @@ -189,8 +201,12 @@ python buildhistory_emit_pkghistory() { pkginfo.pkge = pkge pkginfo.pkgv = pkgv pkginfo.pkgr = pkgr + pkginfo.rprovides = sortpkglist(squashspaces(getpkgvar(pkg, 'RPROVIDES') or "")) pkginfo.rdepends = sortpkglist(squashspaces(getpkgvar(pkg, 'RDEPENDS') or "")) pkginfo.rrecommends = sortpkglist(squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or "")) + pkginfo.rsuggests = sortpkglist(squashspaces(getpkgvar(pkg, 'RSUGGESTS') or "")) + pkginfo.rreplaces = sortpkglist(squashspaces(getpkgvar(pkg, 'RREPLACES') or "")) + pkginfo.rconflicts = sortpkglist(squashspaces(getpkgvar(pkg, 'RCONFLICTS') or "")) pkginfo.files = squashspaces(getpkgvar(pkg, 'FILES') or "") for filevar in pkginfo.filevars: pkginfo.filevars[filevar] = getpkgvar(pkg, filevar) @@ -252,8 +268,15 @@ def write_pkghistory(pkginfo, d): if val: f.write("%s = %s\n" % (pkgvar, val)) + f.write("RPROVIDES = %s\n" % pkginfo.rprovides) f.write("RDEPENDS = %s\n" % pkginfo.rdepends) f.write("RRECOMMENDS = %s\n" % pkginfo.rrecommends) + if pkginfo.rsuggests: + f.write("RSUGGESTS = %s\n" % pkginfo.rsuggests) + if pkginfo.rreplaces: + f.write("RREPLACES = %s\n" % pkginfo.rreplaces) + if pkginfo.rconflicts: + f.write("RCONFLICTS = %s\n" % pkginfo.rconflicts) f.write("PKGSIZE = %d\n" % pkginfo.size) f.write("FILES = %s\n" % pkginfo.files) f.write("FILELIST = %s\n" % pkginfo.filelist) |