From: Grazvydas Ignotas <notasas@gmail.com>
Date: Tue, 10 May 2016 22:45:48 +0000 (+0300)
Subject: package.bbclass: don't mix armhf deps
X-Git-Tag: sz_176~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=831ca2022942cd6b067cfeb3a3dcca2b4d2dafc5;p=openembedded.git

package.bbclass: don't mix armhf deps

the armhf hack was causing other packages to pick up false armhf
dependencies like armhfzlib1g instead of expected libz1
---

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 662b0dbcab..dcfa7cf499 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -715,12 +715,15 @@ python package_do_shlibs() {
 
 	shlib_provider = {}
 	list_re = re.compile('^(.*)\.list$')
+	armhf_re = re.compile('^(armhf.*)\.list$')
 	for dir in [shlibs_dir]: 
 		if not os.path.exists(dir):
 			continue
 		for file in os.listdir(dir):
 			m = list_re.match(file)
 			if m:
+				if bool(armhf_re.match(file)) != pkg.startswith('armhf'):
+					continue
 				dep_pkg = m.group(1)
 				fd = open(os.path.join(dir, file))
 				lines = fd.readlines()