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>

diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index a4db4f8beb851b3b70fcd1717f2b17c1dd6ba5ae..20b50ab8d1b7a5c1467c6c7e7e602119732c0afc 100644 (file)
--- 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 60042a9a73d6b216cd0d1832b04447063817c392..85ec15e64d000d64f8d9cac81a8ce8aa3774ce33 100644 (file)
--- 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"