summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-26 15:05:40 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-27 22:51:34 -0700
commit218e441dd5b6f45e76464d75e2d06c439347f754 (patch)
treeffab3e3383b4dcc8895002818f8c90fe74faa19c
parentea3cfbaf265797950e5eb41f5b886861c880597c (diff)
downloadpoky-218e441dd5b6f45e76464d75e2d06c439347f754.tar.gz
utility-tasks.bbclass: miscellaneous fix
Fix parse error with packages such as spectrum-fw whose name has no version string. Later we may have per-recipe option to disable automatic check for those known with troubles, to reduce complexity in this part. Signed-off-by Kevin Tian <kevin.tian@intel.com>
-rw-r--r--meta/classes/utility-tasks.bbclass3
-rw-r--r--meta/conf/distro/include/private/distro_base_utils_2.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index a4db4f8beb..20b50ab8d1 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -217,6 +217,9 @@ python do_checkpkg() {
217 Return new version if success, or else error in "Errxxxx" style 217 Return new version if success, or else error in "Errxxxx" style
218 """ 218 """
219 def check_new_version(url, curname, d): 219 def check_new_version(url, curname, d):
220 """possible to have no version in pkg name, such as spectrum-fw"""
221 if not re.search("\d+", curname):
222 return pcurver
220 pn = bb.data.getVar('PN', d, 1) 223 pn = bb.data.getVar('PN', d, 1)
221 f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn) 224 f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn)
222 status = internal_fetch_wget(url, d, f) 225 status = internal_fetch_wget(url, d, f)
diff --git a/meta/conf/distro/include/private/distro_base_utils_2.inc b/meta/conf/distro/include/private/distro_base_utils_2.inc
index 60042a9a73..85ec15e64d 100644
--- a/meta/conf/distro/include/private/distro_base_utils_2.inc
+++ b/meta/conf/distro/include/private/distro_base_utils_2.inc
@@ -329,7 +329,7 @@ RECIPE_COMMENTS_pn-tinylogin = "merged into busybox"
329 329
330RECIPE_STATUS_pn-spectrum-fw = "green" # need upgrade 330RECIPE_STATUS_pn-spectrum-fw = "green" # need upgrade
331DEPENDENCY_CHECK_pn-spectrum-fw = "not done" 331DEPENDENCY_CHECK_pn-spectrum-fw = "not done"
332RECIPE_LATEST_VERSION_pn-spectrum-fw = "1" 332RECIPE_LATEST_VERSION_pn-spectrum-fw = "1.0"
333RECIPE_INTEL_SECTION_pn-spectrum-fw = "base utils" 333RECIPE_INTEL_SECTION_pn-spectrum-fw = "base utils"
334RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-spectrum-fw = "n/a" 334RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-spectrum-fw = "n/a"
335RECIPE_LATEST_RELEASE_DATE_pn-spectrum-fw = "n/a" 335RECIPE_LATEST_RELEASE_DATE_pn-spectrum-fw = "n/a"