From 9cff9d4e8c8ca7d6f41c4df16e484087213ae990 Mon Sep 17 00:00:00 2001
From: =?utf8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
Date: Wed, 24 Jun 2015 11:49:42 -0500
Subject: [PATCH] classes/license.bbclass: Improve generic license copy
 validation.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 meta/classes/license.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
-- 
2.40.1