aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-01-23 16:54:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:42:43 +0000
commit8aa508970ab3d83f990c122dd7e242f58b152b1b (patch)
tree9044e8bd1867097869986f644489140f56987ae4 /meta/classes
parenta25f99bc9bf1596a6cea4244d7e8872ecbf87ff2 (diff)
downloadopenembedded-core-contrib-8aa508970ab3d83f990c122dd7e242f58b152b1b.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] (From OE-Core rev: e00f49de8b1f79c3e07b887d257bd75a46052fa0) 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.bbclass8
-rw-r--r--meta/classes/prserv.bbclass2
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8e07168be3d..60d3df7789d 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 33547f989c0..b440d863ef7 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")