license_class: fix license.manifest shows LICENSE field differently to recipe

Drop removal of [|&()*] operators in pkged_lic because this removal is only
needed to validate if license is collected.

[YOCTO #6757]

(From OE-Core rev: 57e5f74382d51f2a8df00e18b6008e3d2b44ad1a)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 91d8bab845762888e8aa5bd07704a8c1c9122b98..dfb162d831b03b9e14c68eb68aae5e52e6681af2 100644 (file)
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -49,24 +49,25 @@ 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}: //; s/[|&()*]/ /g; s/  */ /g; p }" ${filename})"
+               pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; p }" ${filename})"
                if [ -z ${pkged_lic} ]; then
                        # fallback checking value of LICENSE
-                       pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[|&()*]/ /g; s/  */ /g; p }" ${filename})"
+                       pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; p }" ${filename})"
                fi
 
                echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
                echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
                echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
-               printf "LICENSE:" >> ${LICENSE_MANIFEST}
-               for lic in ${pkged_lic}; do
+               echo "LICENSE:" ${pkged_lic} >> ${LICENSE_MANIFEST}
+               echo "" >> ${LICENSE_MANIFEST}
+
+               lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/  */ /g" )"
+               for lic in ${lics}; do
                        # to reference a license file trim trailing + symbol
                        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
 
        # Two options here: