sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

classes/license: remove redundant nested if statements 

Cosmetic change, which improves code perception. Also check for locale
packages firstly, this shall improve performance a little.

(From OE-Core rev: 100e457de4b223defb1a844d3b85af812caf2f79)

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vladimir Zapolskiy 2012-09-11 04:13:45 +03:00 committed by Richard Purdie
parent 5dce00ff49
commit ed4836d319
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta/classes/license.bbclass
View File

@ -90,26 +90,32 @@ license_create_manifest() {
# not the best way to do this but licenses are not arch dependant iirc
filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
# exclude locale recipes
if [ "${pkged_pn}" = "*locale*" ]; then
continue
fi
# check to see if the package name exists in the manifest. if so, bail.
if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
continue
fi
pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
# check to see if the package name exists in the manifest. if so, bail.
if ! grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
# exclude local recipes
if [ ! "${pkged_pn}" = "*locale*" ]; then
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
echo "LICENSE: " >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
else
echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
fi
done
echo "" >> ${LICENSE_MANIFEST}
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
echo "LICENSE: " >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
else
echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
fi
fi
done
echo "" >> ${LICENSE_MANIFEST}
done
# Two options here: