From 043df837a5a4f87936c1e24057785e914ef52cce Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy Date: Tue, 11 Sep 2012 04:18:14 +0300 Subject: 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 (From OE-Core rev: 8fd734e6f9159921d0d148c4d5c0fa37c882b21a) Signed-off-by: Vladimir Zapolskiy Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 8fb66be502..74a830686e 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} -- cgit v1.2.3-54-g00ecf