summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-218e441dd5b6f45e76464d75e2d06c439347f754.tar.gz
openembedded-core-218e441dd5b6f45e76464d75e2d06c439347f754.tar.bz2
openembedded-core-218e441dd5b6f45e76464d75e2d06c439347f754.tar.xz
openembedded-core-218e441dd5b6f45e76464d75e2d06c439347f754.zip
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 a4db4f8be..20b50ab8d 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -217,6 +217,9 @@ python do_checkpkg() {
Return new version if success, or else error in "Errxxxx" style
"""
def check_new_version(url, curname, d):
+ """possible to have no version in pkg name, such as spectrum-fw"""
+ if not re.search("\d+", curname):
+ return pcurver
pn = bb.data.getVar('PN', d, 1)
f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn)
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 60042a9a7..85ec15e64 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"
RECIPE_STATUS_pn-spectrum-fw = "green" # need upgrade
DEPENDENCY_CHECK_pn-spectrum-fw = "not done"
-RECIPE_LATEST_VERSION_pn-spectrum-fw = "1"
+RECIPE_LATEST_VERSION_pn-spectrum-fw = "1.0"
RECIPE_INTEL_SECTION_pn-spectrum-fw = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-spectrum-fw = "n/a"
RECIPE_LATEST_RELEASE_DATE_pn-spectrum-fw = "n/a"