[oe-commits] Vladimir Zapolskiy : classes/license: check license manifest for double records

git at git.openembedded.org git at git.openembedded.org
Wed Sep 12 13:53:51 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 0d3ca97d3a349ca572fce798ebf9de59a438c0c8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0d3ca97d3a349ca572fce798ebf9de59a438c0c8

Author: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
Date:   Tue Sep 11 04:13:44 2012 +0300

classes/license: check license manifest for double records

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

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/license.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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}





More information about the Openembedded-commits mailing list