aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-06-10 16:15:50 -0700
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-03 16:49:24 +0000
commit32c064e567aaba18dfb07b171dde9cc43d0e6de8 (patch)
treee7bddae06fdb992469825b637de41a4c0e4917f3
parent54a2cc32028c99f2541f5be3ef49ff1f292832b0 (diff)
downloadopenembedded-core-32c064e567aaba18dfb07b171dde9cc43d0e6de8.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 master 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 7c4feb15ca..e5663bb689 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