install versions for php and kernel

classes/elphel-misc-functions.bbclass

+# Well
+
+# returns string - based on file
+def version_update(path,file,evr):
+    import os.path
+    if not os.path.exists(path+'/'+file):
+        return 0
+        
+    f=open(path+'/'+file)
+    for line in f:
+        line = line.strip()
+        if (line[0]!="#"):
+            break
+    arr = line.split('.')
+    try:
+        arr[evr]
+    except IndexError:
+        if (evr==1): res = 0
+        if (evr==2): res = revision_update(path,file)
+    else:
+        res = arr[evr]
+    f.close()
+    return res
+    
+def revision_update(path,file):
+    import subprocess
+    cmd = "cd "+path+"; git rev-list --count $(git log -1 --pretty=format:\"%H\" "+file+")..HEAD"
+    try:
+        res = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
+    except subprocess.CalledProcessError as e:
+        res = "error_"+e.returncode
+    res = str(int(res))
+    res = res.strip(' \t\n\r')
+    return res

classes/elphel-misc.bbclass

 # Well
 
-# returns string - based on file
-def version_update(path,file,evr):
-    import os.path
-    if not os.path.exists(path+'/'+file):
-        return 0
-        
-    f=open(path+'/'+file)
-    for line in f:
-        line = line.strip()
-        if (line[0]!="#"):
-            break
-    arr = line.split('.')
-    try:
-        arr[evr]
-    except IndexError:
-        if (evr==1): res = 0
-        if (evr==2): res = revision_update(path,file)
-    else:
-        res = arr[evr]
-    f.close()
-    return res
-    
-def revision_update(path,file):
-    import subprocess
-    cmd = "cd "+path+"; git rev-list --count $(git log -1 --pretty=format:\"%H\" "+file+")..HEAD"
-    try:
-        res = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-    except subprocess.CalledProcessError as e:
-        res = "error_"+e.returncode
-    res = str(int(res))
-    res = res.strip(' \t\n\r')
-    return res
+inherit elphel-misc-functions
 
 VFILE = "VERSION"
 PE = "${@version_update('${VPATH}','${VFILE}',0)}"

recipes-devtools/php/php_5.6.%.bbappend

@@ -55,38 +55,7 @@ do_target_scp () {
     ssh ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
 }
 
-# returns string - based on file
-def version_update(path,file,evr):
-    import os.path
-    if not os.path.exists(path+'/'+file):
-        return 0
-        
-    f=open(path+'/'+file)
-    for line in f:
-        line = line.strip()
-        if (line[0]!="#"):
-            break
-    arr = line.split('.')
-    try:
-        arr[evr]
-    except IndexError:
-        if (evr==1): res = 0
-        if (evr==2): res = revision_update(path,file)
-    else:
-        res = arr[evr]
-    f.close()
-    return res
-    
-def revision_update(path,file):
-    import subprocess
-    cmd = "cd "+path+"; git rev-list --count $(git log -1 --pretty=format:\"%H\" "+file+")..HEAD"
-    try:
-        res = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-    except subprocess.CalledProcessError as e:
-        res = "error_"+e.returncode
-    res = str(int(res))
-    res = res.strip(' \t\n\r')
-    return res
+inherit elphel-misc-functions
 
 ELPHEL_PE = "${@version_update('${VPATH}','${VFILE}',0)}"
 ELPHEL_PV = "${@version_update('${VPATH}','${VFILE}',1)}"

recipes-kernel/linux/linux-xlnx_4.0.bbappend

@@ -158,38 +158,10 @@ kernel_do_compile() {
 	fi
 }
 
-# returns string - based on file
-def version_update(path,file,evr):
-    import os.path
-    if not os.path.exists(path+'/'+file):
-        return 0
-        
-    f=open(path+'/'+file)
-    for line in f:
-        line = line.strip()
-        if (line[0]!="#"):
-            break
-    arr = line.split('.')
-    try:
-        arr[evr]
-    except IndexError:
-        if (evr==1): res = 0
-        if (evr==2): res = revision_update(path,file)
-    else:
-        res = arr[evr]
-    f.close()
-    return res
-    
-def revision_update(path,file):
-    import subprocess
-    cmd = "cd "+path+"; git rev-list --count $(git log -1 --pretty=format:\"%H\" "+file+")..HEAD"
-    try:
-        res = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-    except subprocess.CalledProcessError as e:
-        res = "error_"+e.returncode
-    res = str(int(res))
-    res = res.strip(' \t\n\r')
-    return res
+inherit elphel-misc-functions
+
+VPATH = "${DEV_DIR}"
+VFILE = "VERSION"
     
 ELPHEL_PE = "${@version_update('${VPATH}','${VFILE}',0)}"
 ELPHEL_PV = "${@version_update('${VPATH}','${VFILE}',1)}"