From afc9dea14ffb67902060f32fda79290727b74bec Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 13:20:07 +0000 Subject: classes/base.bbclass: [ftp://ftp.trolltech.com/qt/source/qtopia-core-4.3.0beta.tar.gz] is good enough src_uri as section/groups are unique enough as well. Most of the time (almost always) scoping PN (or PN+PV) is not necessary and in this case the SRC_URI is good enough. Richard thank you for saying the obvious --- classes/base.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 880295fc30..2ea5251609 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -32,6 +32,9 @@ def base_chk_file(parser, pn, pv, src_uri, localpath): elif parser.has_section(pn_src): md5 = parser.get(pn_src, "md5") sha256 = parser.get(pn_src, "sha256") + elif parser.has_section(src_uri): + md5 = parser.get(src_uri, "md5") + sha256 = parser.get(src_uri, "sha256") else: return False #raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) -- cgit v1.2.3 From 9ac0b134bc70feb2aa31422df3e4360deebbcedd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 17:26:11 +0000 Subject: classes/sanity.bblcass: Require shasum since base.bbclass is calling it --- classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 958ab91fa6..580475a9af 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -86,7 +86,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk shasum" for util in required_utilities.split(): if not check_app_exists( util, e.data ): -- cgit v1.2.3 From 9b6d6f02b176f0080a7352876bd25d4dc3ad5d5c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 17:31:33 +0000 Subject: classes/sanity.bbclass: md5sum is required as well --- classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 580475a9af..edef2805d4 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -86,7 +86,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk shasum" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk shasum md5sum" for util in required_utilities.split(): if not check_app_exists( util, e.data ): -- cgit v1.2.3 From 7870e6d52d38140b0789176e98aa658f8e52ed5a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 1 Apr 2007 21:42:48 +0000 Subject: base.bbclass, sanity.bbclass: use sha256sum instead of shasum -a256 --- classes/base.bbclass | 2 +- classes/sanity.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 2ea5251609..6f8196cf80 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -54,7 +54,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath): raise Exception("Executing md5sum failed") try: - shapipe = os.popen('shasum -a256 -p ' + localpath) + shapipe = os.popen('sha256sum -b ' + localpath) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError: diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index edef2805d4..f38644b6cb 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -86,7 +86,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk shasum md5sum" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk sha256sum md5sum" for util in required_utilities.split(): if not check_app_exists( util, e.data ): -- cgit v1.2.3