[oe-commits] Vladimir Zapolskiy : classes/license: account LICENSE_${pkg} values in manifest
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 12 13:53:52 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 8fd734e6f9159921d0d148c4d5c0fa37c882b21a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8fd734e6f9159921d0d148c4d5c0fa37c882b21a
Author: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
Date: Tue Sep 11 04:18:14 2012 +0300
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 at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/license.bbclass | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
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}
More information about the Openembedded-commits
mailing list