From: Chen Qi Date: Thu, 19 Mar 2015 05:17:53 +0000 (+0800) Subject: license.bbclass: skip license checking if the package contains no file X-Git-Tag: 2015-4~76 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f7b6684d2248f4a56e70b292891f9a454275449d;p=openembedded-core.git license.bbclass: skip license checking if the package contains no file If the package doesn't contain any file, then the license isn't relevant as far as the final image is concerned. So we skip the license checking in license_create_manifest if such case. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 95e01213c0..73a0e9727e 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -50,6 +50,7 @@ license_create_manifest() { pkged_pv="$(sed -n 's/^PV: //p' ${filename})" pkged_name="$(basename $(readlink ${filename}))" pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; p }" ${filename})" + pkged_size="$(sed -n "/^PKGSIZE_${pkged_name}: /{ s/^PKGSIZE_${pkged_name}: //; p }" ${filename})" if [ -z "${pkged_lic}" ]; then # fallback checking value of LICENSE pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; p }" ${filename})" @@ -61,6 +62,13 @@ license_create_manifest() { echo "LICENSE:" ${pkged_lic} >> ${LICENSE_MANIFEST} echo "" >> ${LICENSE_MANIFEST} + # If the package doesn't contain any file, that is, its size is 0, the license + # isn't relevant as far as the final image is concerned. So doing license check + # doesn't make much sense, skip it. + if [ "$pkged_size" = "0" ]; then + continue + fi + lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/ */ /g" )" for lic in ${lics}; do # to reference a license file trim trailing + symbol