From: Chen Qi Date: Mon, 18 Nov 2013 07:20:44 +0000 (+0800) Subject: license.bbclass: fix missing of license files on ubuntu build host X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35383 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4df9daee5c732c0a20dabe8515577238a1508512;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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] Signed-off-by: Chen Qi Signed-off-by: Saul Wold --- diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 6d7ee941198..7fe47b2e4be 100644 --- 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