diff options
| author |   Constantin Musca <constantinx.musca@intel.com> | 2013-01-23 16:54:28 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-25 12:35:47 +0000 |
| commit | e00f49de8b1f79c3e07b887d257bd75a46052fa0 (patch) | |
| tree | b9bad731f4747a7f6b2472567c08dd8a75d9c210 /meta/classes | |
| parent | d8c0ce5a4a27c8aa1d07fc15d6e000af725a51e6 (diff) | |
| download | openembedded-core-contrib-e00f49de8b1f79c3e07b887d257bd75a46052fa0.tar.gz | |
prserv: change PRSERV_HOST semantics
- remove PRSERV_PORT variable
- use 'hostname:port' as PRSERV_HOST format
- remove USE_PR_SERV variable
- one can activate PRS by setting PRSERV_HOST
[YOCTO #3744]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/prserv.bbclass | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8e07168be3..60d3df7789 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -396,15 +396,13 @@ def runtime_mapping_rename (varname, d): # python package_get_auto_pr() { - # per recipe PRSERV_HOST PRSERV_PORT + # per recipe PRSERV_HOST pn = d.getVar('PN', True) host = d.getVar("PRSERV_HOST_" + pn, True) - port = d.getVar("PRSERV_PORT_" + pn, True) if not (host is None): d.setVar("PRSERV_HOST", host) - if not (port is None): - d.setVar("PRSERV_PORT", port) - if d.getVar('USE_PR_SERV', True) != "0": + + if d.getVar('PRSERV_HOST', True): try: auto_pr=prserv_get_pr_auto(d) except Exception as e: diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass index 33547f989c..b440d863ef 100644 --- a/meta/classes/prserv.bbclass +++ b/meta/classes/prserv.bbclass @@ -3,7 +3,7 @@ def prserv_get_pr_auto(d): import re pv = d.getVar("PV", True) - if d.getVar('USE_PR_SERV', True) != "1": + if not d.getVar('PRSERV_HOST', True): if 'AUTOINC' in pv: d.setVar("PKGV", pv.replace("AUTOINC", "0")) bb.warn("Not using network based PR service") |