[oe] [PATCH] utils.bbclass: remove tests for checksums.ini

[Frans Meulenbroeks]

Bump

2010/8/16 Frans Meulenbroeks <fransmeulenbroeks at gmail.com>:
> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
> ---
>
> As we have checksums in recipes for quite a while now, I feel the time has come to
> remove the checksums.ini code from utils.bbclass and to remove the (now empty)
> checksums.ini file.
>
> Attached is the patch.
> Your feedback is appreciated
>
>  classes/utils.bbclass |   45 +--------------------------------------------
>  1 files changed, 1 insertions(+), 44 deletions(-)
>  delete mode 100644 conf/checksums.ini
>
> diff --git a/classes/utils.bbclass b/classes/utils.bbclass
> index 7740ea3..83cf33c 100644
> --- a/classes/utils.bbclass
> +++ b/classes/utils.bbclass
> @@ -157,50 +157,7 @@ def base_get_checksums(pn, pv, src_uri, localpath, params, data):
>     expected_md5sum = bb.data.getVarFlag("SRC_URI", md5flag, data)
>     expected_sha256sum = bb.data.getVarFlag("SRC_URI", sha256flag, data)
>
> -    if (expected_md5sum and expected_sha256sum):
> -        return (expected_md5sum,expected_sha256sum)
> -    else:
> -        # missing checksum, parse checksums.ini
> -
> -        # Verify the SHA and MD5 sums we have in OE and check what do
> -        # in
> -        checksum_paths = bb.data.getVar('BBPATH', data, True).split(":")
> -
> -        # reverse the list to give precedence to directories that
> -        # appear first in BBPATH
> -        checksum_paths.reverse()
> -
> -        checksum_files = ["%s/conf/checksums.ini" % path for path in checksum_paths]
> -        try:
> -            parser = base_chk_load_parser(checksum_files)
> -        except ValueError:
> -            bb.note("No conf/checksums.ini found, not checking checksums")
> -            return (None,None)
> -        except:
> -            bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))
> -            return (None,None)
> -        pn_pv_src = "%s-%s-%s" % (pn,pv,src_uri)
> -        pn_src    = "%s-%s" % (pn,src_uri)
> -        if parser.has_section(pn_pv_src):
> -            expected_md5sum    = parser.get(pn_pv_src, "md5")
> -            expected_sha256sum = parser.get(pn_pv_src, "sha256")
> -        elif parser.has_section(pn_src):
> -            expected_md5sum    = parser.get(pn_src, "md5")
> -            expected_sha256sum = parser.get(pn_src, "sha256")
> -        elif parser.has_section(src_uri):
> -            expected_md5sum    = parser.get(src_uri, "md5")
> -            expected_sha256sum = parser.get(src_uri, "sha256")
> -        else:
> -            return (None,None)
> -
> -        if name:
> -            bb.note("This package has no checksums in corresponding recipe '%s', please consider moving its checksums from checksums.ini file \
> -                \nSRC_URI[%s.md5sum] = \"%s\"\nSRC_URI[%s.sha256sum] = \"%s\"\n" % (bb.data.getVar("FILE", data, True), name, expected_md5sum, name, expected_sha256sum))
> -        else:
> -            bb.note("This package has no checksums in corresponding recipe '%s', please consider moving its checksums from checksums.ini file \
> -                \nSRC_URI[md5sum] = \"%s\"\nSRC_URI[sha256sum] = \"%s\"\n" % (bb.data.getVar("FILE", data, True), expected_md5sum, expected_sha256sum))
> -
> -        return (expected_md5sum, expected_sha256sum)
> +    return (expected_md5sum,expected_sha256sum)
>
>  def base_chk_file(pn, pv, src_uri, localpath, params, data):
>     (expected_md5sum, expected_sha256sum) = base_get_checksums(pn, pv, src_uri, localpath, params, data)
> diff --git a/conf/checksums.ini b/conf/checksums.ini
> deleted file mode 100644
> index e69de29..0000000
> --
> 1.7.0.4
>
>