diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-11-18 15:20:44 +0800 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-03 16:49:24 +0000 |
| commit | 54a2cc32028c99f2541f5be3ef49ff1f292832b0 (patch) | |
| tree | 6340b2e2e0189ef6e36d345f86d635ac843eabd4 /meta | |
| parent | 9fdea109d65c338913caa22e3a09f0408c361536 (diff) | |
| download | openembedded-core-54a2cc32028c99f2541f5be3ef49ff1f292832b0.tar.gz openembedded-core-54a2cc32028c99f2541f5be3ef49ff1f292832b0.tar.bz2 openembedded-core-54a2cc32028c99f2541f5be3ef49ff1f292832b0.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]
(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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/license.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 76749c4c29..7c4feb15ca 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -74,9 +74,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 |