diff options
| author | Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> | 2012-09-11 04:18:15 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:43 +0100 |
| commit | 2ebe4d4cfbb8ff80ccc1278f9beb7c5bd721a4e6 (patch) | |
| tree | 4a3b09aedb310a7cda9bb326fd2e2350e74aa0b6 | |
| parent | 043df837a5a4f87936c1e24057785e914ef52cce (diff) | |
| download | ast2050-yocto-poky-2ebe4d4cfbb8ff80ccc1278f9beb7c5bd721a4e6.zip ast2050-yocto-poky-2ebe4d4cfbb8ff80ccc1278f9beb7c5bd721a4e6.tar.gz | |
classes/license: correct license info in lisense.manifest
Trivial change, do not cut off plus symbol from license name, otherwise
information about package license is corrupted.
(From OE-Core rev: ba53de38e96833ea82ddd0f1e336cd7ddfa0c2d1)
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 74a8306..4b5954d 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -103,10 +103,10 @@ license_create_manifest() { 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})" + 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})" + pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[|&()*]/ /g; s/ */ /g; p }" ${filename})" fi echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST} @@ -114,8 +114,9 @@ license_create_manifest() { echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST} echo "LICENSE: " >> ${LICENSE_MANIFEST} for lic in ${pkged_lic}; do - if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then - echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST} + # to reference a license file trim trailing + symbol + if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then + echo ${lic} >> ${LICENSE_MANIFEST} else echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST} fi |
