summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-06-10 16:15:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 15:56:00 +0100
commit8331d0ad41469a99c481c7ebdb0ff0ca54217502 (patch)
tree64097bc5c43f7bbd652783360abbeeacef082335
parente525ef961969ca60922cba21cdadc690f32c41ac (diff)
downloadpoky-8331d0ad41469a99c481c7ebdb0ff0ca54217502.tar.gz
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. (From OE-Core rev: e87232828b761d56f1ce6a27e4009d350d68209c) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass7
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() {
51 printf "LICENSE:" >> ${LICENSE_MANIFEST} 51 printf "LICENSE:" >> ${LICENSE_MANIFEST}
52 for lic in ${pkged_lic}; do 52 for lic in ${pkged_lic}; do
53 # to reference a license file trim trailing + symbol 53 # to reference a license file trim trailing + symbol
54 if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then 54 if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
55 printf " ${lic}" >> ${LICENSE_MANIFEST} 55 bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
56 else
57 echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
58 fi 56 fi
57 printf " ${lic}" >> ${LICENSE_MANIFEST}
59 done 58 done
60 printf "\n\n" >> ${LICENSE_MANIFEST} 59 printf "\n\n" >> ${LICENSE_MANIFEST}
61 done 60 done