From: Aníbal Limón <anibal.limon@linux.intel.com>
Date: Wed, 24 Jun 2015 16:49:42 +0000 (-0500)
Subject: classes/license.bbclass: Improve generic license copy validation.
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9cff9d4e8c8ca7d6f41c4df16e484087213ae990;p=openembedded-core.git

classes/license.bbclass: Improve generic license copy validation.

Remove + char in any position for cover cases when license has
the form like GPL-2.0+-with-OpenSSL-exception.

[YOCTO #7584]

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index fdc117010e..b62910bf26 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -76,8 +76,12 @@ license_create_manifest() {
 				continue
 			fi
 
+			# remove + chars in any position this cover cases like
+			# GPL-2.0+-with-OpenSSL-exception -> GPL-2.0-with-OpenSSL-exception
+			lic="$(echo ${lic} | sed "s/\+//g")"
+
 			# to reference a license file trim trailing + symbol
-			if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
+			if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
 				bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
 			fi
 		done