[oe-commits] Christopher Larson : license.bbclass: include all licenses in the manifest
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 11 14:49:32 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: e87232828b761d56f1ce6a27e4009d350d68209c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e87232828b761d56f1ce6a27e4009d350d68209c
Author: Christopher Larson <chris_larson at mentor.com>
Date: Mon Jun 10 16:15:50 2013 -0700
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 at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 76749c4..2ca47cc 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
More information about the Openembedded-commits
mailing list