mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
a25f99bc9b
commit
8aa508970a
@@ -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:
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user