[OE-core] [PATCH 4/6] classes/license: account LICENSE_${pkg} values in manifest
Vladimir Zapolskiy
vladimir_zapolskiy at mentor.com
Tue Sep 11 01:18:14 UTC 2012
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 at mentor.com>
---
meta/classes/license.bbclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 8fb66be..74a8306 100644
--- 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}
--
1.7.10
More information about the Openembedded-core
mailing list