summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-05 10:58:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:16 +0000
commit59a704679c825d01f417a303a49be7ef34134c4e (patch)
tree34825c2a39d7edf0e35d01f78310717111712945 /meta/classes
parent65049e9fe67ee004f57e7e28ff868d1479fa4544 (diff)
downloadpoky-59a704679c825d01f417a303a49be7ef34134c4e.tar.gz
prs: use the PRServer to replace the BB_URI_LOCALCOUNT functionality
- adapt the PRServer to generate an incremental number for every revision set associated with a (PN, PV) - use one incrementing value rather than several - PV becomes 0.1+gitAUTOINC+deadbeefdecafbad_decafbaddeadbeef - if PV contains 'AUTOINC' set PKGV to the same thing with AUTOINC replaced with the "auto PR" value - if the PRServer isn't running replace AUTOINC with 0 (no package feeds, but usual image creation would work) - use the PR table with "AUTOINC-${PV-without-SRCREVs}" as key - modify prexport/primport to address the generated srcrev entries - this patch addresses the following proposal: http://lists.linuxtogo.org/pipermail/bitbake-devel/2012-November/003878.html (From OE-Core rev: b27b438221e16ac3df6ac66d761b77e3bd43db67) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/classes/prexport.bbclass10
-rw-r--r--meta/classes/prserv.bbclass22
3 files changed, 31 insertions, 5 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3278d37b53..993ce98782 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -411,6 +411,10 @@ python package_get_auto_pr() {
411 bb.fatal("Can NOT get PRAUTO from remote PR service") 411 bb.fatal("Can NOT get PRAUTO from remote PR service")
412 return 412 return
413 d.setVar('PRAUTO',str(auto_pr)) 413 d.setVar('PRAUTO',str(auto_pr))
414 else:
415 pv = d.getVar("PV", True)
416 if 'AUTOINC' in pv:
417 d.setVar("PKGV", pv.replace("AUTOINC", "0"))
414} 418}
415 419
416LOCALEBASEPN ??= "${PN}" 420LOCALEBASEPN ??= "${PN}"
diff --git a/meta/classes/prexport.bbclass b/meta/classes/prexport.bbclass
index b990c2be5e..6b9d540989 100644
--- a/meta/classes/prexport.bbclass
+++ b/meta/classes/prexport.bbclass
@@ -24,6 +24,16 @@ python prexport_handler () {
24 bb.warn("prexport_handler: No AUTOPR values found for %s" % ver) 24 bb.warn("prexport_handler: No AUTOPR values found for %s" % ver)
25 return 25 return
26 oe.prservice.prserv_export_tofile(e.data, None, datainfo, False) 26 oe.prservice.prserv_export_tofile(e.data, None, datainfo, False)
27 if 'AUTOINC' in ver:
28 import re
29 srcpv = bb.fetch2.get_srcrev(e.data)
30 base_ver = "AUTOINC-%s" % ver[:ver.find(srcpv)]
31 e.data.setVar('PRSERV_DUMPOPT_VERSION', base_ver)
32 retval = oe.prservice.prserv_dump_db(e.data)
33 if not retval:
34 bb.fatal("prexport_handler: export failed!")
35 (metainfo, datainfo) = retval
36 oe.prservice.prserv_export_tofile(e.data, None, datainfo, False)
27 elif isinstance(e, bb.event.ParseStarted): 37 elif isinstance(e, bb.event.ParseStarted):
28 import bb.utils 38 import bb.utils
29 import oe.prservice 39 import oe.prservice
diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass
index 0825306f91..33547f989c 100644
--- a/meta/classes/prserv.bbclass
+++ b/meta/classes/prserv.bbclass
@@ -1,6 +1,11 @@
1def prserv_get_pr_auto(d): 1def prserv_get_pr_auto(d):
2 import oe.prservice 2 import oe.prservice
3 import re
4
5 pv = d.getVar("PV", True)
3 if d.getVar('USE_PR_SERV', True) != "1": 6 if d.getVar('USE_PR_SERV', True) != "1":
7 if 'AUTOINC' in pv:
8 d.setVar("PKGV", pv.replace("AUTOINC", "0"))
4 bb.warn("Not using network based PR service") 9 bb.warn("Not using network based PR service")
5 return None 10 return None
6 11
@@ -8,14 +13,21 @@ def prserv_get_pr_auto(d):
8 pkgarch = d.getVar("PACKAGE_ARCH", True) 13 pkgarch = d.getVar("PACKAGE_ARCH", True)
9 checksum = d.getVar("BB_TASKHASH", True) 14 checksum = d.getVar("BB_TASKHASH", True)
10 15
16 conn = d.getVar("__PRSERV_CONN", True)
17 if conn is None:
18 conn = oe.prservice.prserv_make_conn(d)
19 if conn is None:
20 return None
21
22 if "AUTOINC" in pv:
23 srcpv = bb.fetch2.get_srcrev(d)
24 base_ver = "AUTOINC-%s" % version[:version.find(srcpv)]
25 value = conn.getPR(base_ver, pkgarch, srcpv)
26 d.setVar("PKGV", pv.replace("AUTOINC", str(value)))
27
11 if d.getVar('PRSERV_LOCKDOWN', True): 28 if d.getVar('PRSERV_LOCKDOWN', True):
12 auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None 29 auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None
13 else: 30 else:
14 conn = d.getVar("__PRSERV_CONN", True)
15 if conn is None:
16 conn = oe.prservice.prserv_make_conn(d)
17 if conn is None:
18 return None
19 auto_rev = conn.getPR(version, pkgarch, checksum) 31 auto_rev = conn.getPR(version, pkgarch, checksum)
20 32
21 return auto_rev 33 return auto_rev