summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-11-18 15:20:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:04 +0000
commit4df9daee5c732c0a20dabe8515577238a1508512 (patch)
tree78d1fc621cb712c01d8eac71f60694377fc80400
parentf599315f2d944a465dd0081f9e7bfc7294fcd299 (diff)
downloadopenembedded-core-contrib-4df9daee5c732c0a20dabe8515577238a1508512.tar.gz
openembedded-core-contrib-4df9daee5c732c0a20dabe8515577238a1508512.tar.bz2
openembedded-core-contrib-4df9daee5c732c0a20dabe8515577238a1508512.zip
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 <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6d7ee94119..7fe47b2e4b 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