[OE-core] [PATCH 2/6] classes/license: check license manifest for double records

Vladimir Zapolskiy vladimir_zapolskiy at mentor.com
Tue Sep 11 01:13:44 UTC 2012


Trivial typo bugfix, avoid multiple records in license.manifest.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
---
 meta/classes/license.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 0335f41..021ab2e 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -93,7 +93,7 @@ license_create_manifest() {
 		pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
 		pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
 		# check to see if the package name exists in the manifest. if so, bail.
-		if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
+		if ! grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
 			# exclude local recipes
 			if [ ! "${pkged_pn}" = "*locale*" ]; then
 				echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
-- 
1.7.10





More information about the Openembedded-core mailing list