summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>2012-09-11 04:51:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:43 +0100
commita3c257a1364d18a265c41c50583e58290fb11c6a (patch)
tree75ee4f936e9eb2b05d1221b097a4f364d2ee4a99
parent2ebe4d4cfbb8ff80ccc1278f9beb7c5bd721a4e6 (diff)
downloadpoky-a3c257a1364d18a265c41c50583e58290fb11c6a.tar.gz
classes/license: place all found licenses on one line
Cosmetic change, settle all found licenses into one line and report warning about missing licenses loudly. (From OE-Core rev: f015a9eb8265c485da0b20009ba72119035599b1) 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>
-rw-r--r--meta/classes/license.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4b5954d2c5..29fe93843f 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -112,16 +112,16 @@ license_create_manifest() {
112 echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST} 112 echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
113 echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST} 113 echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
114 echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST} 114 echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
115 echo "LICENSE: " >> ${LICENSE_MANIFEST} 115 echo -n "LICENSE:" >> ${LICENSE_MANIFEST}
116 for lic in ${pkged_lic}; do 116 for lic in ${pkged_lic}; do
117 # to reference a license file trim trailing + symbol 117 # to reference a license file trim trailing + symbol
118 if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then 118 if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
119 echo ${lic} >> ${LICENSE_MANIFEST} 119 echo -n " ${lic}" >> ${LICENSE_MANIFEST}
120 else 120 else
121 echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST} 121 echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
122 fi 122 fi
123 done 123 done
124 echo "" >> ${LICENSE_MANIFEST} 124 echo -e "\n" >> ${LICENSE_MANIFEST}
125 done 125 done
126 126
127 # Two options here: 127 # Two options here: