diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-11-18 15:20:44 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-11 14:10:48 +0000 |
commit | 2e5772020f56447dfbc10b6105b71bce6f5a5352 (patch) | |
tree | 0bba5788f9e8b92d3fb9340eb6a3ef4a0d06abae | |
parent | 6a1bec4f6ec78a2f3f7a1adb08992e55521fbe24 (diff) | |
download | poky-2e5772020f56447dfbc10b6105b71bce6f5a5352.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 master rev: 4df9daee5c732c0a20dabe8515577238a1508512)
(From OE-Core rev: 54a2cc32028c99f2541f5be3ef49ff1f292832b0)
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>
-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() { | |||
74 | # Really don't need to copy the generics as they're | 74 | # Really don't need to copy the generics as they're |
75 | # represented in the manifest and in the actual pkg licenses | 75 | # represented in the manifest and in the actual pkg licenses |
76 | # Doing so would make your image quite a bit larger | 76 | # Doing so would make your image quite a bit larger |
77 | if [[ "${lic}" != "generic_"* ]]; then | 77 | if [ "${lic#generic_}" = "${lic}" ]; then |
78 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} | 78 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} |
79 | elif [[ "${lic}" == "generic_"* ]]; then | 79 | else |
80 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then | 80 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then |
81 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ | 81 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ |
82 | fi | 82 | fi |