classes/license: account LICENSE_${pkg} values in manifest

Trivial change, process LICENSE_${pkg} and LICENSE values. This fixes multiple
cases, when license is not specified at all in license.manifest

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

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 8fb66be502151c7cef5463581cfac931cf2c9fcd..74a830686e175e0761a4d114d86e9e0ecdf96573 100644 (file)
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -101,8 +101,13 @@ license_create_manifest() {
                        continue
                fi
 
-               pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
                pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
+               pkged_name="$(basename $(readlink ${filename}))"
+               pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; s/[+|&()*]/ /g; s/  */ /g; p }" ${filename})"
+               if [ -z ${pkged_lic} ]; then
+                       # fallback checking value of LICENSE
+                       pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }" ${filename})"
+               fi
 
                echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
                echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}