aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/prserv.bbclass
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:30:37 +0000
commitb27b438221e16ac3df6ac66d761b77e3bd43db67 (patch)
tree24f0d5a6999c18b1662f38ca1e2852c788d99802 /meta/classes/prserv.bbclass
parenteebd134989b32577cb1e59897de25c320e61f03c (diff)
downloadopenembedded-core-contrib-b27b438221e16ac3df6ac66d761b77e3bd43db67.tar.gz
openembedded-core-contrib-b27b438221e16ac3df6ac66d761b77e3bd43db67.tar.bz2
openembedded-core-contrib-b27b438221e16ac3df6ac66d761b77e3bd43db67.zip
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 Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/prserv.bbclass')
-rw-r--r--meta/classes/prserv.bbclass22
1 files changed, 17 insertions, 5 deletions
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 @@
def prserv_get_pr_auto(d):
import oe.prservice
+ import re
+
+ pv = d.getVar("PV", True)
if d.getVar('USE_PR_SERV', True) != "1":
+ if 'AUTOINC' in pv:
+ d.setVar("PKGV", pv.replace("AUTOINC", "0"))
bb.warn("Not using network based PR service")
return None
@@ -8,14 +13,21 @@ def prserv_get_pr_auto(d):
pkgarch = d.getVar("PACKAGE_ARCH", True)
checksum = d.getVar("BB_TASKHASH", True)
+ conn = d.getVar("__PRSERV_CONN", True)
+ if conn is None:
+ conn = oe.prservice.prserv_make_conn(d)
+ if conn is None:
+ return None
+
+ if "AUTOINC" in pv:
+ srcpv = bb.fetch2.get_srcrev(d)
+ base_ver = "AUTOINC-%s" % version[:version.find(srcpv)]
+ value = conn.getPR(base_ver, pkgarch, srcpv)
+ d.setVar("PKGV", pv.replace("AUTOINC", str(value)))
+
if d.getVar('PRSERV_LOCKDOWN', True):
auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None
else:
- conn = d.getVar("__PRSERV_CONN", True)
- if conn is None:
- conn = oe.prservice.prserv_make_conn(d)
- if conn is None:
- return None
auto_rev = conn.getPR(version, pkgarch, checksum)
return auto_rev