From: Christopher Larson <chris_lar...@mentor.com>

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_lar...@mentor.com>
---
 meta/classes/license.bbclass | 7 +++----
 1 file 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
-- 
1.8.3

_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to