summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-08 09:18:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 14:46:10 +0000
commitf7273d122b89a56cd968d1cc6317f7808afde184 (patch)
treeb4c27c98e8d4e5e6146d5884e72768676aaef523
parent98755bd799851d971b2f81cb298be94b1e26b654 (diff)
downloadpoky-f7273d122b89a56cd968d1cc6317f7808afde184.tar.gz
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]. (From OE-Core rev: 564d76bed7b96d381d6438df81c0d5b4f5a7b2b0) 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.bbclass23
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() {
58 self.pkgr = "" 58 self.pkgr = ""
59 self.size = 0 59 self.size = 0
60 self.depends = "" 60 self.depends = ""
61 self.rprovides = ""
61 self.rdepends = "" 62 self.rdepends = ""
62 self.rrecommends = "" 63 self.rrecommends = ""
64 self.rsuggests = ""
65 self.rreplaces = ""
66 self.rconflicts = ""
63 self.files = "" 67 self.files = ""
64 self.filelist = "" 68 self.filelist = ""
65 # Variables that need to be written to their own separate file 69 # Variables that need to be written to their own separate file
@@ -96,10 +100,18 @@ python buildhistory_emit_pkghistory() {
96 pkginfo.pkgv = value 100 pkginfo.pkgv = value
97 elif name == "PKGR": 101 elif name == "PKGR":
98 pkginfo.pkgr = value 102 pkginfo.pkgr = value
103 elif name == "RPROVIDES":
104 pkginfo.rprovides = value
99 elif name == "RDEPENDS": 105 elif name == "RDEPENDS":
100 pkginfo.rdepends = value 106 pkginfo.rdepends = value
101 elif name == "RRECOMMENDS": 107 elif name == "RRECOMMENDS":
102 pkginfo.rrecommends = value 108 pkginfo.rrecommends = value
109 elif name == "RSUGGESTS":
110 pkginfo.rsuggests = value
111 elif name == "RREPLACES":
112 pkginfo.rreplaces = value
113 elif name == "RCONFLICTS":
114 pkginfo.rconflicts = value
103 elif name == "PKGSIZE": 115 elif name == "PKGSIZE":
104 pkginfo.size = long(value) 116 pkginfo.size = long(value)
105 elif name == "FILES": 117 elif name == "FILES":
@@ -189,8 +201,12 @@ python buildhistory_emit_pkghistory() {
189 pkginfo.pkge = pkge 201 pkginfo.pkge = pkge
190 pkginfo.pkgv = pkgv 202 pkginfo.pkgv = pkgv
191 pkginfo.pkgr = pkgr 203 pkginfo.pkgr = pkgr
204 pkginfo.rprovides = sortpkglist(squashspaces(getpkgvar(pkg, 'RPROVIDES') or ""))
192 pkginfo.rdepends = sortpkglist(squashspaces(getpkgvar(pkg, 'RDEPENDS') or "")) 205 pkginfo.rdepends = sortpkglist(squashspaces(getpkgvar(pkg, 'RDEPENDS') or ""))
193 pkginfo.rrecommends = sortpkglist(squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or "")) 206 pkginfo.rrecommends = sortpkglist(squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or ""))
207 pkginfo.rsuggests = sortpkglist(squashspaces(getpkgvar(pkg, 'RSUGGESTS') or ""))
208 pkginfo.rreplaces = sortpkglist(squashspaces(getpkgvar(pkg, 'RREPLACES') or ""))
209 pkginfo.rconflicts = sortpkglist(squashspaces(getpkgvar(pkg, 'RCONFLICTS') or ""))
194 pkginfo.files = squashspaces(getpkgvar(pkg, 'FILES') or "") 210 pkginfo.files = squashspaces(getpkgvar(pkg, 'FILES') or "")
195 for filevar in pkginfo.filevars: 211 for filevar in pkginfo.filevars:
196 pkginfo.filevars[filevar] = getpkgvar(pkg, filevar) 212 pkginfo.filevars[filevar] = getpkgvar(pkg, filevar)
@@ -252,8 +268,15 @@ def write_pkghistory(pkginfo, d):
252 if val: 268 if val:
253 f.write("%s = %s\n" % (pkgvar, val)) 269 f.write("%s = %s\n" % (pkgvar, val))
254 270
271 f.write("RPROVIDES = %s\n" % pkginfo.rprovides)
255 f.write("RDEPENDS = %s\n" % pkginfo.rdepends) 272 f.write("RDEPENDS = %s\n" % pkginfo.rdepends)
256 f.write("RRECOMMENDS = %s\n" % pkginfo.rrecommends) 273 f.write("RRECOMMENDS = %s\n" % pkginfo.rrecommends)
274 if pkginfo.rsuggests:
275 f.write("RSUGGESTS = %s\n" % pkginfo.rsuggests)
276 if pkginfo.rreplaces:
277 f.write("RREPLACES = %s\n" % pkginfo.rreplaces)
278 if pkginfo.rconflicts:
279 f.write("RCONFLICTS = %s\n" % pkginfo.rconflicts)
257 f.write("PKGSIZE = %d\n" % pkginfo.size) 280 f.write("PKGSIZE = %d\n" % pkginfo.size)
258 f.write("FILES = %s\n" % pkginfo.files) 281 f.write("FILES = %s\n" % pkginfo.files)
259 f.write("FILELIST = %s\n" % pkginfo.filelist) 282 f.write("FILELIST = %s\n" % pkginfo.filelist)