[oe-commits] Chen Qi : license.bbclass: fix missing of license files on ubuntu build host
git at git.openembedded.org
git at git.openembedded.org
Thu Nov 21 15:30:29 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 4df9daee5c732c0a20dabe8515577238a1508512
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4df9daee5c732c0a20dabe8515577238a1508512
Author: Chen Qi <Qi.Chen at windriver.com>
Date: Mon Nov 18 15:20:44 2013 +0800
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 at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/license.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6d7ee94..7fe47b2 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
More information about the Openembedded-commits
mailing list