license.bbclass: fix missing of license files on ubuntu build host

The license_create_manifest function contains bashism, this will lead
to unexpected results on ubuntu build host, as sh is linked to dash on
ubuntu. Even if COPY_LIC_MANIFEST and COPY_LIC_DIRS are enabled, the
license files will still be missing on target.

This patch fixes the above problem.

[YOCTO #5549]

(From OE-Core master rev: 4df9daee5c732c0a20dabe8515577238a1508512)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6abdae4e84dc4e7b08e379ad036af8d9f61163e0..b00ebb12e2c1b29eb3abc10397297a5c8aa29d8a 100644 (file)
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -72,9 +72,9 @@ license_create_manifest() {
                                        # Really don't need to copy the generics as they're 
                                        # represented in the manifest and in the actual pkg licenses
                                        # Doing so would make your image quite a bit larger
-                                       if [[ "${lic}" != "generic_"* ]]; then
+                                       if [ "${lic#generic_}" = "${lic}" ]; then
                                                cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
-                                       elif [[ "${lic}" == "generic_"* ]]; then
+                                       else
                                                if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then
                                                        cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/
                                                fi