summaryrefslogtreecommitdiffstats
path: root/meta
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:31 +0000
commit551fcea978a69b9e9202f56c5599fcd792c85ccd (patch)
treeae7f15ab7d1a162baf8b365bff759b186c0f0cfd /meta
parent489b5d0f17f64c7bd047582cf240cf4354f3c968 (diff)
downloadpoky-551fcea978a69b9e9202f56c5599fcd792c85ccd.tar.gz
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 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.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() {
72 # Really don't need to copy the generics as they're 72 # Really don't need to copy the generics as they're
73 # represented in the manifest and in the actual pkg licenses 73 # represented in the manifest and in the actual pkg licenses
74 # Doing so would make your image quite a bit larger 74 # Doing so would make your image quite a bit larger
75 if [[ "${lic}" != "generic_"* ]]; then 75 if [ "${lic#generic_}" = "${lic}" ]; then
76 cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} 76 cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
77 elif [[ "${lic}" == "generic_"* ]]; then 77 else
78 if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then 78 if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then
79 cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ 79 cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/
80 fi 80 fi