[PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[petri.lehtinen+openembedded-devel]

From: Petri Lehtinen <petri.lehtinen@inoi.fi>

This makes it possible for overlays to have checksum.ini.

Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
---
 classes/base.bbclass |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9ec705b..e5fd814 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -40,12 +40,11 @@ def base_path_relative(src, dest):
     return sep.join(relpath)
 
 # for MD5/SHA handling
-def base_chk_load_parser(config_path):
+def base_chk_load_parser(config_paths):
     import ConfigParser, os, bb
     parser = ConfigParser.ConfigParser()
-    if not len(parser.read(config_path)) == 1:
-        bb.note("Can not open the '%s' ini file" % config_path)
-        raise Exception("Can not open the '%s'" % config_path)
+    if len(parser.read(config_paths)) < 1:
+        raise ValueError("no ini files could be found")
 
     return parser
 
@@ -620,13 +619,18 @@ python base_do_fetch() {
 
 	# Verify the SHA and MD5 sums we have in OE and check what do
 	# in
-	check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini")
-	if not check_sum:
-		bb.note("No conf/checksums.ini found, not checking checksums")
-		return
+	checksum_paths = bb.data.getVar('BBPATH', d, 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(check_sum)
+		parser = base_chk_load_parser(checksum_files)
+	except ValueError:
+		bb.note("No conf/checksums.ini found, not checking checksums")
+		return
 	except:
 		bb.note("Creating the CheckSum parser failed")
 		return
-- 
1.6.0.4

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Khem Raj]

On (15/04/09 10:59), petri.lehtinen+openembedded-devel@inoi.fi wrote:
> From: Petri Lehtinen <petri.lehtinen@inoi.fi>
> 
> This makes it possible for overlays to have checksum.ini.
> 
> Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
> ---
>  classes/base.bbclass |   22 +++++++++++++---------
>  1 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/classes/base.bbclass b/classes/base.bbclass
> index 9ec705b..e5fd814 100644
> --- a/classes/base.bbclass
> +++ b/classes/base.bbclass
> @@ -40,12 +40,11 @@ def base_path_relative(src, dest):
>      return sep.join(relpath)
>  
>  # for MD5/SHA handling
> -def base_chk_load_parser(config_path):
> +def base_chk_load_parser(config_paths):
>      import ConfigParser, os, bb
>      parser = ConfigParser.ConfigParser()
> -    if not len(parser.read(config_path)) == 1:
> -        bb.note("Can not open the '%s' ini file" % config_path)
> -        raise Exception("Can not open the '%s'" % config_path)
> +    if len(parser.read(config_paths)) < 1:
> +        raise ValueError("no ini files could be found")
>  
>      return parser
>  
> @@ -620,13 +619,18 @@ python base_do_fetch() {
>  
>  	# Verify the SHA and MD5 sums we have in OE and check what do
>  	# in
> -	check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini")
> -	if not check_sum:
> -		bb.note("No conf/checksums.ini found, not checking checksums")
> -		return
> +	checksum_paths = bb.data.getVar('BBPATH', d, 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(check_sum)
> +		parser = base_chk_load_parser(checksum_files)
> +	except ValueError:
> +		bb.note("No conf/checksums.ini found, not checking checksums")
> +		return
>  	except:
>  		bb.note("Creating the CheckSum parser failed")
>  		return
> -- 

Looks good to me.

> 1.6.0.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Denys Dmytriyenko]

On Wed, Apr 15, 2009 at 10:59:55AM +0300, petri.lehtinen+openembedded-devel@inoi.fi wrote:
> From: Petri Lehtinen <petri.lehtinen@inoi.fi>
> 
> This makes it possible for overlays to have checksum.ini.

Tested on my overlay - seems to work as advertised.

Acked-by: Denys Dmytriyenko <denis@denix.org>


> Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
> ---
>  classes/base.bbclass |   22 +++++++++++++---------
>  1 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/classes/base.bbclass b/classes/base.bbclass
> index 9ec705b..e5fd814 100644
> --- a/classes/base.bbclass
> +++ b/classes/base.bbclass
> @@ -40,12 +40,11 @@ def base_path_relative(src, dest):
>      return sep.join(relpath)
>  
>  # for MD5/SHA handling
> -def base_chk_load_parser(config_path):
> +def base_chk_load_parser(config_paths):
>      import ConfigParser, os, bb
>      parser = ConfigParser.ConfigParser()
> -    if not len(parser.read(config_path)) == 1:
> -        bb.note("Can not open the '%s' ini file" % config_path)
> -        raise Exception("Can not open the '%s'" % config_path)
> +    if len(parser.read(config_paths)) < 1:
> +        raise ValueError("no ini files could be found")
>  
>      return parser
>  
> @@ -620,13 +619,18 @@ python base_do_fetch() {
>  
>  	# Verify the SHA and MD5 sums we have in OE and check what do
>  	# in
> -	check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini")
> -	if not check_sum:
> -		bb.note("No conf/checksums.ini found, not checking checksums")
> -		return
> +	checksum_paths = bb.data.getVar('BBPATH', d, 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(check_sum)
> +		parser = base_chk_load_parser(checksum_files)
> +	except ValueError:
> +		bb.note("No conf/checksums.ini found, not checking checksums")
> +		return
>  	except:
>  		bb.note("Creating the CheckSum parser failed")
>  		return
> -- 
> 1.6.0.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Chris Larson]

On Wed, Apr 15, 2009 at 12:59 AM,
<petri.lehtinen+openembedded-devel@inoi.fi> wrote:
> From: Petri Lehtinen <petri.lehtinen@inoi.fi>
>
> This makes it possible for overlays to have checksum.ini.
>
> Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>

Nice feature, good to see.
-- 
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Otavio Salvador]

On Wed, Apr 15, 2009 at 9:23 PM, Chris Larson <clarson@kergoth.com> wrote:
> On Wed, Apr 15, 2009 at 12:59 AM,
> <petri.lehtinen+openembedded-devel@inoi.fi> wrote:
>> From: Petri Lehtinen <petri.lehtinen@inoi.fi>
>>
>> This makes it possible for overlays to have checksum.ini.
>>
>> Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
>
> Nice feature, good to see.

A very good canditate for stable, IMO.

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Petri Lehtinen]

Any more comments on this? Could someone push it?

I would like very much to see this in stable, too.

-- 
Petri Lehtinen
Software Specialist
Inoi Oy
Tel. : +358 40 758 0229
Email: petri.lehtinen@inoi.fi

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Denys Dmytriyenko]

On Wed, Apr 22, 2009 at 08:04:23AM +0300, Petri Lehtinen wrote:
> Any more comments on this? Could someone push it?
> 
> I would like very much to see this in stable, too.

Actually, it was already pushed in 4b48c66ff661c3b88f85dee62517a31ae66db242

-- 
Denys

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Petri Lehtinen]

Denys Dmytriyenko wrote:
> On Wed, Apr 22, 2009 at 08:04:23AM +0300, Petri Lehtinen wrote:
> > Any more comments on this? Could someone push it?
> > 
> > I would like very much to see this in stable, too.
> 
> Actually, it was already pushed in 4b48c66ff661c3b88f85dee62517a31ae66db242

Ahh, my bad. Many thanks.

Is there any chance on getting this to stable, too?

-- 
Petri Lehtinen
Software Specialist
Inoi Oy
Tel. : +358 40 758 0229
Email: petri.lehtinen@inoi.fi

Re: [PATCH] base.bbclass: Combine all checksum.ini files found in BBPATH

[Petri Lehtinen]

Petri Lehtinen wrote:
> Ahh, my bad. Many thanks.
> 
> Is there any chance on getting this to stable, too?

Ok, so you have posted a patch for stable to the ML already. My bad
again :)

-- 
Petri Lehtinen
Software Specialist
Inoi Oy
Tel. : +358 40 758 0229
Email: petri.lehtinen@inoi.fi