From e87232828b761d56f1ce6a27e4009d350d68209c Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 10 Jun 2013 16:15:50 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/classes/license.bbclass') 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 -- cgit v1.2.3