summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-08 15:42:42 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-08 21:08:19 -0700
commit90ceeff2587c932f9d998ccf05f01c01300f3268 (patch)
treea037b855ab3db993d356bb5ed265af065a174ebe
parent43bd7936793701839df4dd4e49ef91985ee11e06 (diff)
downloadpoky-90ceeff2587c932f9d998ccf05f01c01300f3268.tar.gz
utility-tasks.bbclass: add automatic version check for GIT/SVN proto
both git/svn supports remote information query: 'git ls-remote', and 'svn info'. With them, now upstream version will be automatically checked for git/svn packages. In the meantime, manual latest version tagged in distro tracking fields are also compared as one alternative if upstream check fails. Also such check is one indicator whether tracking field is missing. Signed-off-by: Kevin Tian <kevin.tian@intel.com>
-rw-r--r--meta/classes/utility-tasks.bbclass72
-rw-r--r--meta/conf/distro/include/private/distro_base_utils_1.inc8
-rw-r--r--meta/conf/distro/include/private/distro_x11_libs.inc2
-rw-r--r--meta/conf/distro/poky.conf2
4 files changed, 70 insertions, 14 deletions
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index c3001ecfc8..a4db4f8beb 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -276,7 +276,6 @@ python do_checkpkg() {
276 276
277 """generate package information from .bb file""" 277 """generate package information from .bb file"""
278 pname = bb.data.getVar('PN', d, 1) 278 pname = bb.data.getVar('PN', d, 1)
279 pcurver = bb.data.getVar('PV', d, 1)
280 pdesc = bb.data.getVar('DESCRIPTION', d, 1) 279 pdesc = bb.data.getVar('DESCRIPTION', d, 1)
281 pgrp = bb.data.getVar('SECTION', d, 1) 280 pgrp = bb.data.getVar('SECTION', d, 1)
282 281
@@ -296,6 +295,11 @@ python do_checkpkg() {
296 295
297 (type, host, path, user, pswd, parm) = bb.decodeurl(uri) 296 (type, host, path, user, pswd, parm) = bb.decodeurl(uri)
298 if type in ['http', 'https', 'ftp']: 297 if type in ['http', 'https', 'ftp']:
298 pcurver = bb.data.getVar('PV', d, 1)
299 else:
300 pcurver = bb.data.getVar("SRCREV", d, 1)
301
302 if type in ['http', 'https', 'ftp']:
299 newver = pcurver 303 newver = pcurver
300 altpath = path 304 altpath = path
301 dirver = "-" 305 dirver = "-"
@@ -342,12 +346,52 @@ python do_checkpkg() {
342 if re.match("Err", newver): 346 if re.match("Err", newver):
343 pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname 347 pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname
344 elif type == 'git': 348 elif type == 'git':
345 """N.B. Now hardcode UPDATE for git/svn/cvs.""" 349 if user:
346 pupver = "master" 350 gituser = user + '@'
347 pstatus = "UPDATE" 351 else:
352 gituser = ""
353
354 if 'protocol' in parm:
355 gitproto = parm['protocol']
356 else:
357 gitproto = "rsync"
358
359 gitcmd = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path)
360 print gitcmd
361 ver = os.popen(gitcmd).read()
362 if ver and re.search("HEAD", ver):
363 pupver = ver.split("\t")[0]
364 if pcurver == pupver:
365 pstatus = "MATCH"
366 else:
367 pstatus = "UPDATE"
368 else:
369 pstatus = "ErrGitAccess"
348 elif type == 'svn': 370 elif type == 'svn':
349 pupver = "HEAD" 371 options = []
350 pstatus = "UPDATE" 372 if user:
373 options.append("--username %s" % user)
374 if pswd:
375 options.append("--password %s" % pswd)
376 svnproto = 'svn'
377 if 'proto' in parm:
378 svnproto = parm['proto']
379 if 'rev' in parm:
380 pcurver = parm['rev']
381
382 svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"])
383 print svncmd
384 svninfo = os.popen(svncmd).read()
385 for line in svninfo.split("\n"):
386 if re.search("^Last Changed Rev:", line):
387 pupver = line.split(" ")[-1]
388 if pcurver == pupver:
389 pstatus = "MATCH"
390 else:
391 pstatus = "UPDATE"
392
393 if re.match("Err", pstatus):
394 pstatus = "ErrSvnAccess"
351 elif type == 'cvs': 395 elif type == 'cvs':
352 pupver = "HEAD" 396 pupver = "HEAD"
353 pstatus = "UPDATE" 397 pstatus = "UPDATE"
@@ -360,10 +404,22 @@ python do_checkpkg() {
360 404
361 if re.match("Err", pstatus): 405 if re.match("Err", pstatus):
362 pstatus += ":%s%s" % (host, path) 406 pstatus += ":%s%s" % (host, path)
407
408 """Read from manual distro tracking fields as alternative"""
409 pmver = bb.data.getVar("RECIPE_LATEST_VERSION", d, 1)
410 if not pmver:
411 pmver = "N/A"
412 pmstatus = "ErrNoRecipeData"
413 else:
414 if pmver == pcurver:
415 pmstatus = "MATCH"
416 else:
417 pmstatus = "UPDATE"
418
363 lf = bb.utils.lockfile(logfile + ".lock") 419 lf = bb.utils.lockfile(logfile + ".lock")
364 f = open(logfile, "a") 420 f = open(logfile, "a")
365 f.write("\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \ 421 f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
366 (pname, pgrp, pproto, pcurver, pupver, pstatus, pdesc)) 422 (pname, pgrp, pproto, pcurver, pmver, pupver, pmstatus, pstatus, pdesc))
367 f.close() 423 f.close()
368 bb.utils.unlockfile(lf) 424 bb.utils.unlockfile(lf)
369} 425}
diff --git a/meta/conf/distro/include/private/distro_base_utils_1.inc b/meta/conf/distro/include/private/distro_base_utils_1.inc
index b36eec7e40..8f7559ac83 100644
--- a/meta/conf/distro/include/private/distro_base_utils_1.inc
+++ b/meta/conf/distro/include/private/distro_base_utils_1.inc
@@ -47,7 +47,7 @@ RECIPE_COMMENTS_pn-initramfs-live-install = "local scripts follow Poky's MIT lic
47RECIPE_STATUS_pn-initscripts = "green" 47RECIPE_STATUS_pn-initscripts = "green"
48DEPENDENCY_CHECK_pn-initscripts = "not done" 48DEPENDENCY_CHECK_pn-initscripts = "not done"
49RECIPE_LATEST_VERSION_pn-initscripts = "1.0" 49RECIPE_LATEST_VERSION_pn-initscripts = "1.0"
50RECIPE_PATCH_pn-initscripts+* = "many local scripts" 50RECIPE_PATCH_pn-initscripts = "many local scripts"
51RECIPE_INTEL_SECTION_pn-initscripts = "base utils" 51RECIPE_INTEL_SECTION_pn-initscripts = "base utils"
52RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-initscripts = "n/a" 52RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-initscripts = "n/a"
53RECIPE_LATEST_RELEASE_DATE_pn-initscripts = "n/a" 53RECIPE_LATEST_RELEASE_DATE_pn-initscripts = "n/a"
@@ -56,7 +56,7 @@ RECIPE_COMMENTS_pn-initscripts = "local scripts follow Poky's MIT license"
56RECIPE_STATUS_pn-keymaps = "yellow" # LICENSE 56RECIPE_STATUS_pn-keymaps = "yellow" # LICENSE
57DEPENDENCY_CHECK_pn-keymaps = "not done" 57DEPENDENCY_CHECK_pn-keymaps = "not done"
58RECIPE_LATEST_VERSION_pn-keymaps = "1.0" 58RECIPE_LATEST_VERSION_pn-keymaps = "1.0"
59RECIPE_PATCH_pn-keymaps+* = "many local keymap files" 59RECIPE_PATCH_pn-keymaps = "many local keymap files"
60RECIPE_INTEL_SECTION_pn-keymaps = "base utils" 60RECIPE_INTEL_SECTION_pn-keymaps = "base utils"
61RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-keymaps = "n/a" 61RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-keymaps = "n/a"
62RECIPE_LATEST_RELEASE_DATE_pn-keymaps = "n/a" 62RECIPE_LATEST_RELEASE_DATE_pn-keymaps = "n/a"
@@ -74,7 +74,7 @@ RECIPE_COMMENTS_pn-modutils-initscripts = "local scripts follow Poky's MIT licen
74RECIPE_STATUS_pn-network-suspend-scripts = "yellow" # no PV 74RECIPE_STATUS_pn-network-suspend-scripts = "yellow" # no PV
75DEPENDENCY_CHECK_pn-network-suspend-scripts = "not done" 75DEPENDENCY_CHECK_pn-network-suspend-scripts = "not done"
76RECIPE_LATEST_VERSION_pn-network-suspend-scripts = "1.0" 76RECIPE_LATEST_VERSION_pn-network-suspend-scripts = "1.0"
77RECIPE_PATCH_pn-network-suspend-scripts+* = "local scripts" 77RECIPE_PATCH_pn-network-suspend-scripts = "local scripts"
78RECIPE_INTEL_SECTION_pn-network-suspend-scripts = "base utils" 78RECIPE_INTEL_SECTION_pn-network-suspend-scripts = "base utils"
79RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-network-suspend-scripts = "n/a" 79RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-network-suspend-scripts = "n/a"
80RECIPE_LATEST_RELEASE_DATE_pn-network-suspend-scripts = "n/a" 80RECIPE_LATEST_RELEASE_DATE_pn-network-suspend-scripts = "n/a"
@@ -83,7 +83,7 @@ RECIPE_COMMENTS_pn-network-suspend-scripts = "local scripts follow Poky's MIT li
83RECIPE_STATUS_pn-opkg-collateral = "yellow" # license 83RECIPE_STATUS_pn-opkg-collateral = "yellow" # license
84DEPENDENCY_CHECK_pn-opkg-collateral = "not done" 84DEPENDENCY_CHECK_pn-opkg-collateral = "not done"
85RECIPE_LATEST_VERSION_pn-opkg-collateral = "1.0" 85RECIPE_LATEST_VERSION_pn-opkg-collateral = "1.0"
86RECIPE_PATCH_pn-opkg-collateral+* = "local" 86RECIPE_PATCH_pn-opkg-collateral = "local"
87RECIPE_INTEL_SECTION_pn-opkg-collateral = "base utils" 87RECIPE_INTEL_SECTION_pn-opkg-collateral = "base utils"
88RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-opkg-collateral = "n/a" 88RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-opkg-collateral = "n/a"
89RECIPE_LATEST_RELEASE_DATE_pn-opkg-collateral = "n/a" 89RECIPE_LATEST_RELEASE_DATE_pn-opkg-collateral = "n/a"
diff --git a/meta/conf/distro/include/private/distro_x11_libs.inc b/meta/conf/distro/include/private/distro_x11_libs.inc
index 3fbc582f61..73e89be099 100644
--- a/meta/conf/distro/include/private/distro_x11_libs.inc
+++ b/meta/conf/distro/include/private/distro_x11_libs.inc
@@ -426,7 +426,7 @@ RECIPE_COMMENTS_pn-libxau = ""
426 426
427RECIPE_STATUS_pn-libxcalibrate = "yellow" 427RECIPE_STATUS_pn-libxcalibrate = "yellow"
428DEPENDENCY_CHECK_pn-libxcalibrate = "not done" 428DEPENDENCY_CHECK_pn-libxcalibrate = "not done"
429RECIPE_LATEST_VERSION_pn-libxcalibrate = "0.0+git0+209d83af61ed38a002c8096377deac292b3e396c" 429RECIPE_LATEST_VERSION_pn-libxcalibrate = "209d83af61ed38a002c8096377deac292b3e396c"
430RECIPE_NO_OF_PATCHES_pn-libxcalibrate = "1" 430RECIPE_NO_OF_PATCHES_pn-libxcalibrate = "1"
431RECIPE_PATCH_pn-libxcalibrate+fix-xcb = "There is no extra reply data and if we say not to disgard it, xcb throws fatal asserts. RP - 26/11/09" 431RECIPE_PATCH_pn-libxcalibrate+fix-xcb = "There is no extra reply data and if we say not to disgard it, xcb throws fatal asserts. RP - 26/11/09"
432RECIPE_INTEL_SECTION_pn-libxcalibrate = "x11/libs" 432RECIPE_INTEL_SECTION_pn-libxcalibrate = "x11/libs"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 951e156c25..a99aba7966 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -116,4 +116,4 @@ IMAGE_FEATURES ?= ""
116EXTRAOPKGCONFIG = "poky-feed-config-opkg" 116EXTRAOPKGCONFIG = "poky-feed-config-opkg"
117 117
118require conf/distro/include/world-broken.inc 118require conf/distro/include/world-broken.inc
119 119require conf/distro/include/distro_tracking_fields.inc