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