diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2013-06-10 16:15:50 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-11 15:47:09 +0100 |
| commit | e87232828b761d56f1ce6a27e4009d350d68209c (patch) | |
| tree | 21413ccffa7d88485704509be5c5022c51b28fdb | |
| parent | c0f435cde195e1d037af32c69aa1732797362cfa (diff) | |
| download | openembedded-core-e87232828b761d56f1ce6a27e4009d350d68209c.tar.gz openembedded-core-e87232828b761d56f1ce6a27e4009d350d68209c.tar.bz2 openembedded-core-e87232828b761d56f1ce6a27e4009d350d68209c.zip | |
license.bbclass: include all licenses in the manifest
When we don't have a generic license file for the license in question, we can
warn, but we should still include it in the manifest, otherwise the manifest
doesn't reflect reality. Failing to include a license listed in the recipe in
the manifest can't be allowed.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 76749c4c29..2ca47cc198 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -51,11 +51,10 @@ license_create_manifest() { printf "LICENSE:" >> ${LICENSE_MANIFEST} for lic in ${pkged_lic}; do # to reference a license file trim trailing + symbol - if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then - printf " ${lic}" >> ${LICENSE_MANIFEST} - else - echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}" + if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then + bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" fi + printf " ${lic}" >> ${LICENSE_MANIFEST} done printf "\n\n" >> ${LICENSE_MANIFEST} done |